buildsystem - rename QT_MAJOR_VERSION to Qt_VERSION_MAJOR

as this is consistent with CMake style and other projects

CMakeLists.txt

@@ -114,20 +114,20 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/KDAB/modules")
 if(${PROJECT_NAME}_QT6)
   find_package(Qt6Widgets REQUIRED)
   find_package(Qt6Test REQUIRED)
-  set(QT_MAJOR_VERSION 6)
+  set(Qt_VERSION_MAJOR 6)
   set(KDDockWidgets_LIBRARY_QTID "-qt6")
 else()
   find_package(Qt5Widgets 5.12 REQUIRED)
   find_package(Qt5Test 5.12 REQUIRED)
-  set(QT_MAJOR_VERSION 5)
+  set(Qt_VERSION_MAJOR 5)
   set(KDDockWidgets_LIBRARY_QTID "")
 endif()
 include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
 
 set(${PROJECT_NAME}_DEPS "widgets")
 if(${PROJECT_NAME}_QTQUICK)
-  find_package(Qt${QT_MAJOR_VERSION}Quick)
-  find_package(Qt${QT_MAJOR_VERSION}QuickControls2)
+  find_package(Qt${Qt_VERSION_MAJOR}Quick)
+  find_package(Qt${Qt_VERSION_MAJOR}QuickControls2)
   add_definitions(-DKDDOCKWIDGETS_QTQUICK)
   set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
 else()
@@ -221,7 +221,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 
   # Generate .pri file for qmake users
   #TODO: ECM does not support Qt6 yet
-  if(QT_MAJOR_VERSION EQUAL 5 AND
+  if(Qt_VERSION_MAJOR EQUAL 5 AND
     CMAKE_VERSION VERSION_GREATER "3.11.99" AND NOT CMAKE_CONFIGURATION_TYPES) # Not working with VS generator or older cmake versions
     include(ECMGeneratePriFile)
     set(PROJECT_VERSION_STRING ${${PROJECT_NAME}_VERSION})

python/PyKDDockWidgets/CMakeLists.txt

@@ -48,9 +48,9 @@ set(PyKDDockWidgets_target_include_directories
 # Libraries that will be necessary to link the target, this will used in the command 'target_link_libraries'
 set(PyKDDockWidgets_target_link_libraries
     KDAB::kddockwidgets
-    Qt${QT_MAJOR_VERSION}::Core
-    Qt${QT_MAJOR_VERSION}::Gui
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt${Qt_VERSION_MAJOR}::Core
+    Qt${Qt_VERSION_MAJOR}::Gui
+    Qt${Qt_VERSION_MAJOR}::Widgets
 )
 
 # changes on these files should trigger a new generation

src/CMakeLists.txt

@@ -283,16 +283,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR IS_CLANG_BUILD)
 endif()
 
 if(${PROJECT_NAME}_QTQUICK)
-  target_link_libraries(kddockwidgets PUBLIC Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Quick Qt${QT_MAJOR_VERSION}::QuickControls2)
+  target_link_libraries(kddockwidgets PUBLIC Qt${Qt_VERSION_MAJOR}::Widgets Qt${Qt_VERSION_MAJOR}::Quick Qt${Qt_VERSION_MAJOR}::QuickControls2)
 else()
-  target_link_libraries(kddockwidgets PUBLIC Qt${QT_MAJOR_VERSION}::Widgets)
+  target_link_libraries(kddockwidgets PUBLIC Qt${Qt_VERSION_MAJOR}::Widgets)
 endif()
 
 if(WIN32)
-  target_link_libraries(kddockwidgets PRIVATE Qt${QT_MAJOR_VERSION}::GuiPrivate dwmapi)
+  target_link_libraries(kddockwidgets PRIVATE Qt${Qt_VERSION_MAJOR}::GuiPrivate dwmapi)
 elseif(NOT APPLE AND NOT EMSCRIPTEN AND NOT ${PROJECT_NAME}_QT6)
-  find_package(Qt${QT_MAJOR_VERSION}X11Extras)
-  target_link_libraries(kddockwidgets PUBLIC Qt${QT_MAJOR_VERSION}::X11Extras)
+  find_package(Qt${Qt_VERSION_MAJOR}X11Extras)
+  target_link_libraries(kddockwidgets PUBLIC Qt${Qt_VERSION_MAJOR}::X11Extras)
 endif()
 
 set_target_properties(kddockwidgets PROPERTIES
@@ -376,7 +376,7 @@ if(${PROJECT_NAME}_DEVELOPER_MODE)
 
   if(NOT ${PROJECT_NAME}_QTQUICK AND KDDockWidgets_LINTER) # TODO: We can support it
     add_executable(kddockwidgets_linter layoutlinter_main.cpp)
-    target_link_libraries(kddockwidgets_linter kddockwidgets Qt${QT_MAJOR_VERSION}::Widgets)
+    target_link_libraries(kddockwidgets_linter kddockwidgets Qt${Qt_VERSION_MAJOR}::Widgets)
   endif()
 
 endif()

tests/CMakeLists.txt

@@ -33,12 +33,12 @@ option(KDDockWidgets_FUZZER "Builds the fuzzer" ON)
 # tst_docks
 set(TESTING_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_resources.qrc)
 add_executable(tst_docks tst_docks.cpp ${TESTING_SRCS} ${TESTING_RESOURCES})
-target_link_libraries(tst_docks kddockwidgets Qt${QT_MAJOR_VERSION}::Test)
+target_link_libraries(tst_docks kddockwidgets Qt${Qt_VERSION_MAJOR}::Test)
 set_compiler_flags(tst_docks)
 
 if(NOT ${PROJECT_NAME}_QTQUICK)
   add_executable(tst_multisplitter tst_multisplitter.cpp)
-  target_link_libraries(tst_multisplitter kddockwidgets Qt${QT_MAJOR_VERSION}::Test)
+  target_link_libraries(tst_multisplitter kddockwidgets Qt${Qt_VERSION_MAJOR}::Test)
   set_compiler_flags(tst_multisplitter)
   if(KDDockWidgets_FUZZER)
     add_subdirectory(fuzzer)
@@ -47,4 +47,4 @@ endif()
 
 # tests_launcher
 add_executable(tests_launcher tests_launcher.cpp)
-target_link_libraries(tests_launcher Qt${QT_MAJOR_VERSION}::Core)
+target_link_libraries(tests_launcher Qt${Qt_VERSION_MAJOR}::Core)

tests/fuzzer/CMakeLists.txt

@@ -12,5 +12,5 @@
 add_executable(fuzzer main.cpp Fuzzer.cpp Operations.cpp ../Testing.cpp)
 
 set_property(TARGET fuzzer PROPERTY CXX_STANDARD 17)
-target_link_libraries(fuzzer kddockwidgets Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Test)
+target_link_libraries(fuzzer kddockwidgets Qt${Qt_VERSION_MAJOR}::Widgets Qt${Qt_VERSION_MAJOR}::Test)
 set_compiler_flags(fuzzer)