KDE/kdelibs

[Tobias Koenig]

SVN commit 556896 by tokoe:

Make kdelibs compile with current qt4.2 snapshot

You have to update qt-copy to get compiled current trunk/kdelibs compiled
successfully.

CCMAIL:kde-core-devel at kde.org


 M  +0 -1      CMakeLists.txt  
 M  +1 -0      cmake/modules/FindQt4.cmake  
 D             cmake/modules/FindQtDBus.cmake  


--- trunk/KDE/kdelibs/CMakeLists.txt #556895:556896
@@ -20,7 +20,6 @@
 endif(MSVC_IDE)
 
 find_package(KDE4Internal REQUIRED)
-find_package(QtDBus REQUIRED)
 find_package(ZLIB REQUIRED)
 
 if (APPLE)
--- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #556895:556896
@@ -503,6 +503,7 @@
     SET(QT_QTXML_LIBRARY_DEBUG        "-framework QtXml"      CACHE STRING "The QtXml library.")
     SET(QT_QTSVG_LIBRARY_RELEASE      "-framework QtSvg"      CACHE STRING "The QtSvg library.")
     SET(QT_QTSVG_LIBRARY_DEBUG        "-framework QtSvg"      CACHE STRING "The QtSvg library.")
+    SET(QT_QTDBUS_LIBRARY_RELEASE     "-framework QtDBus"     CACHE STRING "The QtBBus library.")
     SET(QT_QTDBUS_LIBRARY_DEBUG       "-framework QtDBus"     CACHE STRING "The QtBBus library.")