Do not use all Qt macros and functions

We don't need these if we use ECM.
lirios · Dec 12, 2023 · c7ba96a · c7ba96a
1 parent a2e9daf
commit c7ba96a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,4 @@
 # SPDX-FileCopyrightText: 2022 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-#
 # SPDX-License-Identifier: BSD-3-Clause
 
 cmake_minimum_required(VERSION 3.19)
@@ -20,7 +19,7 @@ endif()
 include(FeatureSummary)
 
 ## Find Qt:
-find_package(Qt6
+find_package(Qt6 6.6.0
     REQUIRED
     COMPONENTS
         Core
@@ -45,9 +44,6 @@ remove_definitions(-DQT_NO_KEYWORDS)
 ## CMake settings:
 include(KDECMakeSettings)
 
-## Project setup:
-qt_standard_project_setup(REQUIRES 6.6)
-
 ## Disable use of C++ API deprecated in Qt 5.15
 add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
 

diff --git a/src/waylandscanner/CMakeLists.txt b/src/waylandscanner/CMakeLists.txt
@@ -1,19 +1,14 @@
-# SPDX-FileCopyrightText: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-#
+# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 # SPDX-License-Identifier: BSD-3-Clause
 
-qt_add_executable(waylandscanner
-    MANUAL_FINALIZATION
-    waylandscanner.cpp
-)
+add_executable(waylandscanner waylandscanner.cpp)
 
 set_target_properties(waylandscanner PROPERTIES OUTPUT_NAME aurora-wayland-scanner)
 
-qt_finalize_target(waylandscanner)
-
-target_link_libraries(waylandscanner PUBLIC
-    Qt6::Core
-    Qt6::Xml
+target_link_libraries(waylandscanner
+    PRIVATE
+        Qt6::Core
+        Qt6::Xml
 )
 
 add_executable(Liri::waylandscanner ALIAS waylandscanner)