[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rekonq/frameworks] src: First work on KWebSpellChecker port
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2014-07-13 22:19:35
Message-ID: E1X6S7L-0000Ko-JI () scm ! kde ! org
[Download RAW message or body]

Git commit 12356186d4e7449f00c5a2681898a7e914a987e3 by Andrea Diamantini.
Committed on 13/07/2014 at 20:29.
Pushed by adjam into branch 'frameworks'.

First work on KWebSpellChecker port

M  +4    -4    src/CMakeLists.txt
M  +0    -1    src/kspellplugin.cpp
M  +2    -2    src/kspellplugin.h

http://commits.kde.org/rekonq/12356186d4e7449f00c5a2681898a7e914a987e3

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec2242e..1b45ddd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_SUBDIRECTORY (data)
 =

 ### ------- SETTING REKONQ FILES...
 #ADD_DEFINITIONS (-DQT_STATICPLUGIN)
-# QT4_WRAP_CPP(wk_HEADERS_MOC qwebkitplatformplugin.h)
+#QT5_WRAP_CPP(wk_HEADERS_MOC qwebkitplatformplugin.h)
 =

 # src files
 SET (rekonq_KDEINIT_SRCS
@@ -214,10 +214,10 @@ INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
 # ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH)
 =

 =

-### -------------- ADDING DEFINITIONS...
-
-#ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} )
+### -------------- THIS SHOULD BE NEEDED FOR THE kwebspellchecker PLUGIN...
 =

+#ADD_LIBRARY(kwebspellchecker STATIC kspellplugin.h kspellplugin.cpp ${wk_=
HEADERS_MOC})
+#TARGET_LINK_LIBRARIES(kwebspellchecker Qt5::Core Qt5::Gui Qt5::WebKitWidg=
ets)
 =

 ### -------------- ADDING APPLICATION ICON...
 =

diff --git a/src/kspellplugin.cpp b/src/kspellplugin.cpp
index 4c3df7a..75bdead 100644
--- a/src/kspellplugin.cpp
+++ b/src/kspellplugin.cpp
@@ -219,5 +219,4 @@ QObject* KWebKitPlatformPlugin::createExtension(Extensi=
on ext) const
 =

 =

 // -----------------------------------------------------------------------=
-----------------------------------------
-// FIXME Q_EXPORT_PLUGIN2(kwebspellchecker, KWebKitPlatformPlugin);
 Q_IMPORT_PLUGIN(kwebspellchecker)
diff --git a/src/kspellplugin.h b/src/kspellplugin.h
index c7c56d4..9bea50e 100644
--- a/src/kspellplugin.h
+++ b/src/kspellplugin.h
@@ -41,8 +41,6 @@ class KWebSpellChecker : public QWebSpellChecker
 {
     Q_OBJECT
     =

-    Q_PLUGIN_METADATA()
-    =

 public:
     Sonnet::Speller *m_speller;
 =

@@ -71,6 +69,8 @@ class KWebKitPlatformPlugin : public QObject, public QWeb=
KitPlatformPlugin
     Q_OBJECT
     Q_INTERFACES(QWebKitPlatformPlugin)
 =

+    Q_PLUGIN_METADATA(IID "org.kde.rekonq.webkitplatformplugin")
+
 public:
     KWebKitPlatformPlugin();
     ~KWebKitPlatformPlugin();

[prev in list] [next in list] [prev in thread] [next in thread]