From 10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Fri, 3 Dec 2021 22:33:28 +0200
Subject: WIP: Change the build system to enable building with Qt 6

This was built with:
-DQT_MAJOR_VERSION=6 \
-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.90.0 \
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055a00

Move the include(KDEInstallDirs) call before the first find_package(Qt*,
the former is what auto-detects the Qt version, and defaults to 5. This is
needed to be able to build against Qt5 by default.

All unit tests still pass.
---
 KF5ConfigMacros.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'KF5ConfigMacros.cmake')

diff --git a/KF5ConfigMacros.cmake b/KF5ConfigMacros.cmake
index 3ceaf17c..80c947d8 100644
--- a/KF5ConfigMacros.cmake
+++ b/KF5ConfigMacros.cmake
@@ -111,7 +111,7 @@ function (KCONFIG_ADD_KCFG_FILES _target_or_source_var)
 
        if(ARG_GENERATE_MOC)
           list(APPEND sources ${_moc_FILE})
-          qt5_generate_moc(${_header_FILE} ${_moc_FILE})
+          qt_generate_moc(${_header_FILE} ${_moc_FILE})
           set_property(SOURCE ${_src_FILE} APPEND PROPERTY OBJECT_DEPENDS ${_moc_FILE} )
        endif()
 
-- 
cgit v1.2.1