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

List:       kde-commits
Subject:    [kdelibs/frameworks] kross/qts: Make the Kross QtScript plugin build with Qt 5.
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2012-06-30 15:32:41
Message-ID: 20120630153241.D3264A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit ffdc725c773f6ffc04ed2c9cbf6c71d89f44d4b5 by Stephen Kelly.
Committed on 30/06/2012 at 17:26.
Pushed by skelly into branch 'frameworks'.

Make the Kross QtScript plugin build with Qt 5.

M  +2    -0    kross/qts/plugin.cpp
M  +2    -0    kross/qts/plugin.h

http://commits.kde.org/kdelibs/ffdc725c773f6ffc04ed2c9cbf6c71d89f44d4b5

diff --git a/kross/qts/plugin.cpp b/kross/qts/plugin.cpp
index 4592c3c..d1e8d78 100644
--- a/kross/qts/plugin.cpp
+++ b/kross/qts/plugin.cpp
@@ -26,7 +26,9 @@
 =

 using namespace Kross;
 =

+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 Q_EXPORT_PLUGIN2(krossqtsplugin, Kross::EcmaPlugin)
+#endif
 =

 namespace Kross {
 =

diff --git a/kross/qts/plugin.h b/kross/qts/plugin.h
index ae1bce8..7c41eccd 100644
--- a/kross/qts/plugin.h
+++ b/kross/qts/plugin.h
@@ -43,6 +43,8 @@ namespace Kross {
     */
     class KROSSQTSPLUGIN_EXPORT EcmaPlugin : public QScriptExtensionPlugin
     {
+        Q_OBJECT
+        Q_PLUGIN_METADATA(IID "org.kde.EcmaPlugin")
         public:
 =

             /**
[prev in list] [next in list] [prev in thread] [next in thread]