giucam · EndlessEden · Jun 10, 2018 · Jun 10, 2018 · Jun 10, 2018 · Jun 10, 2018
diff --git a/src/authorizer_helper/CMakeLists.txt b/src/authorizer_helper/CMakeLists.txt
@@ -13,8 +13,7 @@ list(APPEND defines "LIBEXEC_PATH=\"${CMAKE_INSTALL_PREFIX}/libexec\"")
 list(APPEND defines "QT_MESSAGELOGCONTEXT")
 
 add_executable(orbital-authorizer-helper ${SOURCES} ${RESOURCES})
-qt5_use_modules(orbital-authorizer-helper Core)
-target_link_libraries(orbital-authorizer-helper wayland-client)
+target_link_libraries(orbital-authorizer-helper wayland-client Qt5::Core)
 set_target_properties(orbital-authorizer-helper PROPERTIES COMPILE_DEFINITIONS "${defines}")
 
 install(TARGETS orbital-authorizer-helper DESTINATION libexec)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -84,8 +84,7 @@ list(APPEND defines "BIN_PATH=\"${CMAKE_INSTALL_PREFIX}/bin\"")
 list(APPEND defines "QT_MESSAGELOGCONTEXT")
 
 add_executable(orbital-client ${SOURCES} ${RESOURCES} ${QM_FILES})
-qt5_use_modules(orbital-client Widgets Qml Quick)
-target_link_libraries(orbital-client ${WaylandClient_LIBRARIES})
+target_link_libraries(orbital-client ${WaylandClient_LIBRARIES}  Qt5::Core Qt5::Widgets Qt5::Qml Qt5::Quick)
 set_target_properties(orbital-client PROPERTIES COMPILE_DEFINITIONS "${defines}")
 target_include_directories(orbital-client PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 

diff --git a/src/client/services/datetime/CMakeLists.txt b/src/client/services/datetime/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
 set(SOURCES datetime.cpp)
 
 add_library(datetime SHARED ${SOURCES})
-qt5_use_modules(datetime Core Qml)
+target_link_libraries(datetime Qt5::Core Qt5::Qml)
 
 set(dest lib/orbital/qml/Orbital/DateTimeService)
 install(TARGETS datetime DESTINATION ${dest})

diff --git a/src/client/services/hardware/CMakeLists.txt b/src/client/services/hardware/CMakeLists.txt
@@ -22,8 +22,7 @@ elseif (${use_solid} MATCHES ON)
 endif()
 
 add_library(hardwareservice SHARED ${SOURCES})
-qt5_use_modules(hardwareservice Core Qml)
-target_link_libraries(hardwareservice ${libs})
+target_link_libraries(hardwareservice ${libs} Qt5::Core Qt5::Qml)
 set_target_properties(hardwareservice PROPERTIES COMPILE_DEFINITIONS "${defines}")
 set(dest lib/orbital/qml/Orbital/HardwareService)
 install(TARGETS hardwareservice DESTINATION ${dest})

diff --git a/src/client/services/login/CMakeLists.txt b/src/client/services/login/CMakeLists.txt
@@ -18,7 +18,7 @@ if (${use_logind} MATCHES ON)
 endif()
 
 add_library(loginservice SHARED ${SOURCES})
-qt5_use_modules(loginservice Core DBus Qml)
+target_link_libraries(loginservice Qt5::Core Qt5::DBus Qt5::Widgets Qt5::Qml Qt5::Quick)
 set_target_properties(loginservice PROPERTIES COMPILE_DEFINITIONS "${defines}")
 target_link_libraries(loginservice pam)
 set(dest lib/orbital/qml/Orbital/LoginService)

diff --git a/src/client/services/mixer/CMakeLists.txt b/src/client/services/mixer/CMakeLists.txt
@@ -23,7 +23,8 @@ if (${pulse_FOUND})
 endif()
 
 add_library(mixerservice SHARED ${SOURCES})
-qt5_use_modules(mixerservice Core Qml)
+
+target_link_libraries(mixerservice Qt5::Core Qt5::Qml)
 
 if (${ALSA_FOUND})
     include_directories("${ALSA_INCLUDE_DIR}")

diff --git a/src/client/services/mpris/CMakeLists.txt b/src/client/services/mpris/CMakeLists.txt
@@ -8,9 +8,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
 set(SOURCES mprisservice.cpp)
 
 add_library(mprisservice SHARED ${SOURCES})
-qt5_use_modules(mprisservice Core Qml DBus)
 
-target_link_libraries(mprisservice)
+target_link_libraries(mprisservice   Qt5::Core Qt5::Widgets Qt5::Qml Qt5::DBus Qt5::Quick)
 
 set(dest lib/orbital/qml/Orbital/MprisService)
 set_target_properties(mprisservice PROPERTIES COMPILE_DEFINITIONS "${defines}")

diff --git a/src/client/services/notifications/CMakeLists.txt b/src/client/services/notifications/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
 set(SOURCES notificationsservice.cpp notificationsadaptor.cpp notificationsiconprovider.cpp)
 
 add_library(notificationsservice SHARED ${SOURCES})
-qt5_use_modules(notificationsservice Core DBus Quick)
+target_link_libraries(notificationsservice Qt5::Core Qt5::DBus Qt5::Quick)
 set_target_properties(notificationsservice PROPERTIES COMPILE_DEFINITIONS "${defines}")
 set(dest lib/orbital/qml/Orbital/NotificationsService)
 install(TARGETS notificationsservice DESTINATION ${dest})

diff --git a/src/client/services/processlauncher/CMakeLists.txt b/src/client/services/processlauncher/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
 set(SOURCES processlauncher.cpp)
 
 add_library(processlauncher SHARED ${SOURCES})
-qt5_use_modules(processlauncher Core Qml)
+target_link_libraries(processlauncher Qt5::Core Qt5::Qml)
 set(dest lib/orbital/qml/Orbital/ProcessLauncherService)
 install(TARGETS processlauncher DESTINATION ${dest})
 install(FILES qmldir DESTINATION ${dest})
diff --git a/src/client/services/statusnotifier/CMakeLists.txt b/src/client/services/statusnotifier/CMakeLists.txt
@@ -13,7 +13,7 @@ set(SOURCES statusnotifierservice.cpp
             statusnotifiericonprovider.cpp)
 
 add_library(statusnotifierservice SHARED ${SOURCES})
-qt5_use_modules(statusnotifierservice Core DBus Qml Gui Quick)
+target_link_libraries(statusnotifierservice Qt5::Core Qt5::Widgets Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick)
 set_target_properties(statusnotifierservice PROPERTIES COMPILE_DEFINITIONS "${defines}")
 set(dest lib/orbital/qml/Orbital/StatusNotifierService)
 install(TARGETS statusnotifierservice DESTINATION ${dest})

diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 pkg_check_modules(WaylandServer wayland-server REQUIRED)
-pkg_check_modules(libweston libweston-3 REQUIRED)
-pkg_check_modules(libweston-desktop libweston-desktop-3 REQUIRED)
+pkg_check_modules(libweston libweston-5 REQUIRED)
+pkg_check_modules(libweston-desktop libweston-desktop-5 REQUIRED)
 
 find_package(Qt5Core)
 
@@ -71,9 +71,8 @@ list(APPEND defines "BIN_PATH=\"${CMAKE_INSTALL_PREFIX}/bin\"")
 list(APPEND defines "QT_MESSAGELOGCONTEXT")
 
 add_executable(orbital ${SOURCES})
-qt5_use_modules(orbital Core)
-target_link_libraries(orbital wayland-server ${libweston_LIBRARIES} ${libweston-desktop_LIBRARIES} pixman-1 xkbcommon)
-set_target_properties(orbital PROPERTIES COMPILE_DEFINITIONS "${defines}")
+set_target_properties(orbital PROPERTIES ENABLE_EXPORTS 1 COMPILE_DEFINITIONS "${defines}")
+target_link_libraries(orbital wayland-server ${libweston_LIBRARIES} ${libweston-desktop_LIBRARIES} pixman-1 xkbcommon  Qt5::Core Qt5::Widgets Qt5::Qml Qt5::Quick orbital Core)
 
 install(TARGETS orbital DESTINATION bin)
 

diff --git a/src/compositor/compositor.cpp b/src/compositor/compositor.cpp
@@ -452,8 +452,7 @@ bool Compositor::init(StringView socketName)
     if (!m_backend->init(m_compositor)) {
         return false;
     }
-
-    weston_pending_output_coldplug(m_compositor);
+    weston_pending_output_coldplug(m_compositor);	
 
     const char *socket = nullptr;
     std::string socketStr;
@@ -478,16 +477,14 @@ bool Compositor::init(StringView socketName)
 
     weston_compositor_wake(m_compositor);
 
-    weston_compositor_add_key_binding(m_compositor, KEY_BACKSPACE,
-                          (weston_keyboard_modifier)(MODIFIER_CTRL | MODIFIER_ALT),
-                          terminate_binding, this);
-    weston_install_debug_key_binding(m_compositor, MODIFIER_SUPER);
-    weston_compositor_add_debug_binding(m_compositor, KEY_D, [](weston_keyboard *, uint32_t, uint32_t key, void *) {
-        Debug::toggleDebugOutput();
-    }, nullptr);
-
     weston_compositor_set_default_pointer_grab(m_compositor, &defaultPointerGrab);
-
+    weston_compositor_add_key_binding(m_compositor, KEY_BACKSPACE,	
+                          (weston_keyboard_modifier)(MODIFIER_CTRL | MODIFIER_ALT),	
+                          terminate_binding, this);	
+    weston_install_debug_key_binding(m_compositor, MODIFIER_SUPER);	
+    weston_compositor_add_debug_binding(m_compositor, KEY_D, [](weston_keyboard *, uint32_t, uint32_t key, void *) {	
+        Debug::toggleDebugOutput();	
+    }, nullptr);
     m_authorizer = new Authorizer(this);
     m_shell = new Shell(this);
     Workspace *ws = m_shell->createWorkspace();

diff --git a/src/compositor/drm-backend/CMakeLists.txt b/src/compositor/drm-backend/CMakeLists.txt
@@ -6,5 +6,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. /usr/include/libdrm)
 set(SOURCES drm-backend.cpp)
 
 add_library(drm-backend SHARED ${SOURCES})
-qt5_use_modules(drm-backend Core)
+target_link_libraries(drm-backend Qt5::Cor)
 install(TARGETS drm-backend DESTINATION lib/orbital/compositor/backends)
diff --git a/src/compositor/wayland-backend/CMakeLists.txt b/src/compositor/wayland-backend/CMakeLists.txt
@@ -6,5 +6,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 set(SOURCES wayland-backend.cpp)
 
 add_library(wayland-backend SHARED ${SOURCES})
-qt5_use_modules(wayland-backend Core)
+target_link_libraries(wayland-backend Qt5::Core)
 install(TARGETS wayland-backend DESTINATION lib/orbital/compositor/backends)
diff --git a/src/compositor/x11-backend/CMakeLists.txt b/src/compositor/x11-backend/CMakeLists.txt
@@ -6,5 +6,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 set(SOURCES x11-backend.cpp)
 
 add_library(x11-backend SHARED ${SOURCES})
-qt5_use_modules(x11-backend Core)
+target_link_libraries(x11-backend Qt5::Core)
 install(TARGETS x11-backend DESTINATION lib/orbital/compositor/backends)
diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
@@ -14,8 +14,7 @@ wayland_add_protocol_client(SOURCES ../../protocol/desktop-shell.xml desktop-she
 qt5_add_resources(RESOURCES resources.qrc)
 
 add_executable(orbital-launcher ${SOURCES} ${RESOURCES} ${QM_FILES})
-qt5_use_modules(orbital-launcher Qml Quick)
-target_link_libraries(orbital-launcher wayland-client)
+target_link_libraries(orbital-launcher wayland-client Qt5::Qml Qt5::Quick)
 set_target_properties(orbital-launcher PROPERTIES COMPILE_DEFINITIONS "DATA_PATH=\"${CMAKE_INSTALL_PREFIX}/share/orbital/launcher\"")
 target_include_directories(orbital-launcher PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 

diff --git a/src/screenshooter/CMakeLists.txt b/src/screenshooter/CMakeLists.txt
@@ -16,8 +16,7 @@ list(APPEND defines "LIBEXEC_PATH=\"${CMAKE_INSTALL_PREFIX}/libexec\"")
 list(APPEND defines "QT_MESSAGELOGCONTEXT")
 
 add_executable(orbital-screenshooter ${SOURCES} ${RESOURCES})
-qt5_use_modules(orbital-screenshooter Widgets Qml Quick)
-target_link_libraries(orbital-screenshooter wayland-client)
+target_link_libraries(orbital-screenshooter wayland-client Qt5::Widgets Qt5::Qml Qt5::Quick)
 set_target_properties(orbital-screenshooter PROPERTIES COMPILE_DEFINITIONS "${defines}")
 target_include_directories(orbital-screenshooter PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 

diff --git a/src/splash/CMakeLists.txt b/src/splash/CMakeLists.txt
@@ -17,8 +17,7 @@ qt5_add_translation(QM_FILES ${translations})
 qt5_add_resources(RESOURCES resources.qrc)
 
 add_executable(orbital-splash ${SOURCES} ${RESOURCES} ${QM_FILES})
-qt5_use_modules(orbital-splash Qml Quick)
-target_link_libraries(orbital-splash wayland-client)
+target_link_libraries(orbital-splash wayland-client ${WaylandClient_LIBRARIES} Qt5::Qml Qt5::Quick)
 set_target_properties(orbital-splash PROPERTIES COMPILE_DEFINITIONS "DATA_PATH=\"${CMAKE_INSTALL_PREFIX}/share/orbital/splash\"")
 target_include_directories(orbital-splash PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 

diff --git a/test/compositor/CMakeLists.txt b/test/compositor/CMakeLists.txt
@@ -9,9 +9,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../src/compositor ../../src/u
 add_executable(tst_stringview tst_stringview.cpp ../../src/utils/stringview.cpp)
 add_test(tst_stringview tst_stringview)
 add_dependencies(check tst_stringview)
-qt5_use_modules(tst_stringview Core Test)
+target_link_libraries(tst_stringview Qt5::Core Qt5::Test)
 
 add_executable(tst_maybe tst_maybe.cpp)
 add_test(tst_maybe tst_maybe)
 add_dependencies(check tst_maybe)
-qt5_use_modules(tst_maybe Core Test)
+target_link_libraries(tst_maybe Qt5::Core Qt5::Test)