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

List:       kde-devel
Subject:    =?utf-8?q?=5Bamarok=5D_src/context/scriptengine/javascript=3A_Th?=
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2011-06-05 20:43:05
Message-ID: 20110605204305.66A52A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit edd2377b84f97da52cb8e5fa714a9ff9f8ae2a0b by Michael Jansen.
Committed on 05/06/2011 at 22:26.
Pushed by mjansen into branch 'master'.

The Q_DECLARE_METATYPE(DataEngine*) was added to the "Plasma/Service" header.

Fix
        error: redefinition of 'struct QMetaTypeId<Plasma::Service*>'
        error: redefinition of 'struct QMetaTypeId<Plasma::ServiceJob*

This "Plasma/Service" change was a source incompatible change but i leave it to
more capable minds to consider if it is acceptable. I have no clue.

CCMAIL: kde-devel@kde.org
CCMAIL: amarok-devel@kde.org
CCMAIL: aseigo@kde.org

M  +3    -1    src/context/scriptengine/javascript/bind_dataengine.h     

http://commits.kde.org/amarok/edd2377b84f97da52cb8e5fa714a9ff9f8ae2a0b

diff --git a/src/context/scriptengine/javascript/bind_dataengine.h \
b/src/context/scriptengine/javascript/bind_dataengine.h index 93b1e87..5e6d490 100644
--- a/src/context/scriptengine/javascript/bind_dataengine.h
+++ b/src/context/scriptengine/javascript/bind_dataengine.h
@@ -26,11 +26,13 @@
 
 using namespace Plasma;
 
-#if !KDE_IS_VERSION(4, 4, 76)
+#if !KDE_IS_VERSION(4, 4, 76) 
 Q_DECLARE_METATYPE(DataEngine*)
 #endif
+#if !KDE_VERSION(4, 6, 80)
 Q_DECLARE_METATYPE(Service*)
 Q_DECLARE_METATYPE(ServiceJob*)
+#endif
 Q_DECLARE_METATYPE(QVariant)
 Q_DECLARE_METATYPE(DataEngine::Dict)
 Q_DECLARE_METATYPE(DataEngine::Data)
 
> > Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


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