| @@ -76,13 +76,13 @@
#include <string>
diff -ru mapplauncherd/src/qdeclarativebooster/CMakeLists.txt mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt
--- mapplauncherd/src/qdeclarativebooster/CMakeLists.txt 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt 2012-11-16 12:38:08.326160394 +0000
++++ mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt 2012-11-16 12:54:10.611290518 +0000
@@ -1,4 +1,3 @@
-include(FindX11)
# Qt support
include(${QT_USE_FILE})
-@@ -14,6 +13,12 @@
+@@ -14,6 +13,13 @@
set(MOC_HDRS eventhandler.h)
qt4_wrap_cpp(MOC_SRC ${MOC_HDRS})
@@ -91,20 +91,21 @@
+find_package(Qt5Quick1 REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
++find_package(Qt5Concurrent REQUIRED)
+
# Set executables
add_library(mdeclarativecache SHARED ${LIBSRC} ${MOC_SRC})
set_target_properties(mdeclarativecache PROPERTIES
-@@ -21,7 +26,7 @@
+@@ -21,7 +27,7 @@
if ($ENV{HARMATTAN})
set_target_properties(mdeclarativecache PROPERTIES COMPILE_FLAGS -DHAVE_PATH_REINIT)
endif ($ENV{HARMATTAN})
-target_link_libraries(mdeclarativecache ${LIBDL} ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} "-L../launcherlib -lapplauncherd")
-+target_link_libraries(mdeclarativecache ${LIBDL} ${Qt5Core_LIBRARIES} ${Qt5Quick1_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} "-L../launcherlib -lapplauncherd")
++target_link_libraries(mdeclarativecache ${LIBDL} ${Qt5Core_LIBRARIES} ${Qt5Quick1_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Concurrent_LIBRARIES} "-L../launcherlib -lapplauncherd")
add_dependencies(mdeclarativecache applauncherd)
add_library(qdeclarativebooster MODULE ${PLUGINSRC})
-@@ -30,6 +35,9 @@
+@@ -30,6 +36,9 @@
target_link_libraries(qdeclarativebooster ${LIBDL} "-L. -lmdeclarativecache -L../launcherlib -lapplauncherd")
add_dependencies(qdeclarativebooster applauncherd mdeclarativecache)
|
