From 225f1ccab60105783f7c9182fbe551adc427f994 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 30 Nov 2021 16:53:53 +0100 Subject: Revert "If QT_MAJOR_VERSION is not defined, use 5" There is no path out of QtVersionOption.cmake that would let QT_MAJOR_VERSION undefined, so this check is unnecessary. Worse, this doesn't actually check for QT_MAJOR_VERSION being defined, but whether a variable named after the content of the QT_MAJOR_VERSION variable is defined. That is always false, so this effectively forces Qt5 and breaks Qt6 support. This reverts commit 8fd79163a7c60386fbc94bc14ca4a3b0b29d7227. --- kde-modules/KDEInstallDirs.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 6bd9ab18..5dbf97d9 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -12,7 +12,4 @@ Since 5.82.0, prior to that equivalent to KDEInstallDirs5. #]=======================================================================] include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake) -if(NOT DEFINED ${QT_MAJOR_VERSION}) - set(QT_MAJOR_VERSION 5) -endif() include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirs${QT_MAJOR_VERSION}.cmake) -- cgit v1.2.1