SVN commit 972922 by abizjak:

Revert compilation hack, will fix real issue in kdesupport (cache vars being overwritten)


 M  +1 -1      CMakeLists.txt  
 M  +1 -1      agentbase.cpp  
 M  +1 -1      collectioncreatejob.cpp  
 M  +2 -2      collectionfetchjob.cpp  
 M  +1 -1      collectionmodifyjob.cpp  
 M  +1 -1      collectionselectjob.cpp  
 M  +1 -1      collectionstatisticsjob.cpp  
 M  +1 -1      entitydisplayattribute.cpp  
 M  +1 -1      item.cpp  
 M  +1 -1      itemcopyjob.cpp  
 M  +1 -1      itemcreatejob.cpp  
 M  +2 -2      itemfetchjob.cpp  
 M  +1 -1      itemmodifyjob.cpp  
 M  +1 -1      job.cpp  
 M  +1 -1      linkjob.cpp  
 M  +1 -1      monitor.cpp  
 M  +1 -1      monitor_p.cpp  
 M  +1 -1      resourcebase.cpp  
 M  +2 -2      resourceselectjob.cpp  
 M  +1 -1      searchcreatejob.cpp  
 M  +2 -2      session.cpp  
 M  +1 -1      session_p.h  
 M  +1 -1      unlinkjob.cpp  


--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #972921:972922
@@ -120,7 +120,7 @@
 
 # DBus interfaces and adaptors
 set(akonadi_xml ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.NotificationManager.xml)
-set_source_files_properties(${akonadi_xml} PROPERTIES INCLUDE "akonadi/private/notificationmessage_p.h")
+set_source_files_properties(${akonadi_xml} PROPERTIES INCLUDE "notificationmessage_p.h")
 qt4_add_dbus_interface( akonadikde_LIB_SRC ${akonadi_xml} notificationmanagerinterface )
 qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.AgentManager.xml )
 qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Tracer.xml )
--- trunk/KDE/kdepimlibs/akonadi/agentbase.cpp #972921:972922
@@ -26,7 +26,7 @@
 #include "controladaptor.h"
 #include "statusadaptor.h"
 #include "monitor_p.h"
-#include <akonadi/private/xdgbasedirs_p.h>
+#include "xdgbasedirs_p.h"
 
 #include "session.h"
 #include "session_p.h"
--- trunk/KDE/kdepimlibs/akonadi/collectioncreatejob.cpp #972921:972922
@@ -18,7 +18,7 @@
 */
 
 #include "collectioncreatejob.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "protocolhelper_p.h"
 
 #include "job_p.h"
--- trunk/KDE/kdepimlibs/akonadi/collectionfetchjob.cpp #972921:972922
@@ -19,9 +19,9 @@
 
 #include "collectionfetchjob.h"
 
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job_p.h"
-#include <akonadi/private/protocol_p.h>
+#include "protocol_p.h"
 #include "protocolhelper_p.h"
 #include "entity_p.h"
 
--- trunk/KDE/kdepimlibs/akonadi/collectionmodifyjob.cpp #972921:972922
@@ -18,7 +18,7 @@
 */
 
 #include "collectionmodifyjob.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job_p.h"
 #include "protocolhelper_p.h"
 #include "collectionstatistics.h"
--- trunk/KDE/kdepimlibs/akonadi/collectionselectjob.cpp #972921:972922
@@ -20,7 +20,7 @@
 #include "collectionselectjob_p.h"
 
 #include "job_p.h"
-#include <akonadi/private/protocol_p.h>
+#include "protocol_p.h"
 
 #include <QtCore/QDebug>
 
--- trunk/KDE/kdepimlibs/akonadi/collectionstatisticsjob.cpp #972921:972922
@@ -21,7 +21,7 @@
 
 #include "collection.h"
 #include "collectionstatistics.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job_p.h"
 
 #include <kdebug.h>
--- trunk/KDE/kdepimlibs/akonadi/entitydisplayattribute.cpp #972921:972922
@@ -19,7 +19,7 @@
 
 #include "entitydisplayattribute.h"
 
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 
 #include <KIcon>
 
--- trunk/KDE/kdepimlibs/akonadi/item.cpp #972921:972922
@@ -20,7 +20,7 @@
 #include "item.h"
 #include "item_p.h"
 #include "itemserializer_p.h"
-#include <akonadi/private/protocol_p.h>
+#include "protocol_p.h"
 
 #include <kurl.h>
 
--- trunk/KDE/kdepimlibs/akonadi/itemcopyjob.cpp #972921:972922
@@ -20,7 +20,7 @@
 #include "itemcopyjob.h"
 
 #include "collection.h"
-#include <akonadi/private/imapset_p.h>
+#include "imapset_p.h"
 #include "job_p.h"
 
 using namespace Akonadi;
--- trunk/KDE/kdepimlibs/akonadi/itemcreatejob.cpp #972921:972922
@@ -21,7 +21,7 @@
 #include "itemcreatejob.h"
 
 #include "collection.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "item.h"
 #include "itemserializer_p.h"
 #include "job_p.h"
--- trunk/KDE/kdepimlibs/akonadi/itemfetchjob.cpp #972921:972922
@@ -22,13 +22,13 @@
 #include "attributefactory.h"
 #include "collection.h"
 #include "collectionselectjob_p.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "itemfetchscope.h"
 #include "itemserializer_p.h"
 #include "itemserializerplugin.h"
 #include "job_p.h"
 #include "entity_p.h"
-#include <akonadi/private/protocol_p.h>
+#include "protocol_p.h"
 #include "protocolhelper_p.h"
 
 #include <kdebug.h>
--- trunk/KDE/kdepimlibs/akonadi/itemmodifyjob.cpp #972921:972922
@@ -22,7 +22,7 @@
 
 #include "collection.h"
 #include "entity_p.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "itemserializer_p.h"
 #include "job_p.h"
 #include "item_p.h"
--- trunk/KDE/kdepimlibs/akonadi/job.cpp #972921:972922
@@ -21,7 +21,7 @@
 
 #include "job.h"
 #include "job_p.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "session.h"
 #include "session_p.h"
 
--- trunk/KDE/kdepimlibs/akonadi/linkjob.cpp #972921:972922
@@ -21,7 +21,7 @@
 
 #include "collection.h"
 #include "job_p.h"
-#include <akonadi/private/imapset_p.h>
+#include <imapset_p.h>
 
 using namespace Akonadi;
 
--- trunk/KDE/kdepimlibs/akonadi/monitor.cpp #972921:972922
@@ -21,7 +21,7 @@
 #include "monitor_p.h"
 
 #include "itemfetchjob.h"
-#include <akonadi/private/notificationmessage_p.h>
+#include "notificationmessage_p.h"
 #include "session.h"
 
 #include <kdebug.h>
--- trunk/KDE/kdepimlibs/akonadi/monitor_p.cpp #972921:972922
@@ -24,7 +24,7 @@
 #include "collectionfetchjob.h"
 #include "collectionstatistics.h"
 #include "itemfetchjob.h"
-#include <akonadi/private/notificationmessage_p.h>
+#include "notificationmessage_p.h"
 #include "session.h"
 
 #include <kdebug.h>
--- trunk/KDE/kdepimlibs/akonadi/resourcebase.cpp #972921:972922
@@ -27,7 +27,7 @@
 #include "itemsync.h"
 #include "resourcescheduler_p.h"
 #include "tracerinterface.h"
-#include <akonadi/private/xdgbasedirs_p.h>
+#include "xdgbasedirs_p.h"
 
 #include "changerecorder.h"
 #include "collectionfetchjob.h"
--- trunk/KDE/kdepimlibs/akonadi/resourceselectjob.cpp #972921:972922
@@ -19,9 +19,9 @@
 
 #include "resourceselectjob_p.h"
 
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job_p.h"
-#include <akonadi/private/protocol_p.h>
+#include "protocol_p.h"
 
 #include <KDebug>
 
--- trunk/KDE/kdepimlibs/akonadi/searchcreatejob.cpp #972921:972922
@@ -19,7 +19,7 @@
 
 #include "searchcreatejob.h"
 
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job_p.h"
 
 using namespace Akonadi;
--- trunk/KDE/kdepimlibs/akonadi/session.cpp #972921:972922
@@ -20,11 +20,11 @@
 #include "session.h"
 #include "session_p.h"
 
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 #include "job.h"
 #include "job_p.h"
 #include "servermanager_p.h"
-#include <akonadi/private/xdgbasedirs_p.h>
+#include "xdgbasedirs_p.h"
 
 #include <kdebug.h>
 #include <klocale.h>
--- trunk/KDE/kdepimlibs/akonadi/session_p.h #972921:972922
@@ -21,7 +21,7 @@
 #define AKONADI_SESSION_P_H
 
 #include "session.h"
-#include <akonadi/private/imapparser_p.h>
+#include "imapparser_p.h"
 
 #include <QtNetwork/QLocalSocket>
 
--- trunk/KDE/kdepimlibs/akonadi/unlinkjob.cpp #972921:972922
@@ -21,7 +21,7 @@
 
 #include "collection.h"
 #include "job_p.h"
-#include <akonadi/private/imapset_p.h>
+#include <imapset_p.h>
 
 using namespace Akonadi;