feat: Add support fot QT6 (optional)

Author: pktiuk

CMakeLists.txt

@@ -85,6 +85,7 @@ if(WIN32)
     option(PORTABLE_WIN "Compile app for portability" OFF)
 endif(WIN32)
 
+option(USE_QT6_BY_DEFAULT "Use Qt6 if available (if not available fallback to QT5)" OFF)
 option(UPDATE_TRANSLATIONS "Call lupdate to update translation files from source." OFF)
 option(TRANS_REMOVE_OBSOLETE "Add -noobsolete option to lupdate command to get rid of old text entries" OFF)
 option(ATTACH_FAKE_CLASSES "Fake classes can be used in application to tests functionalities" OFF)
@@ -523,15 +524,37 @@ endif(UNIX)
 set(QT_REQUIRED_VERSION 5.8)
 set(CMAKE_AUTOMOC TRUE) # required by moc preprocessor used in QT
 
-find_package(QT NAMES Qt5 REQUIRED) # used to get version number in QT_VERSION_MAJOR and QT_VERSION
-message("Found QT: ${QT_VERSION}")
+if(USE_QT6_BY_DEFAULT)
+    find_package(Qt6 COMPONENTS Core)
+    if(NOT Qt6_FOUND)
+        message("QT6 not found. Falling back to QT5.")
+    endif()
+else()
+    find_package(Qt5 COMPONENTS Core)
+    if(NOT Qt5_FOUND)
+        message("QT5 not found. Falling back to QT6.")
+    endif()
+endif()
+
+if (Qt6_FOUND OR NOT Qt5_FOUND)
+    find_package(Qt6 ${QT_REQUIRED_VERSION} 
+        COMPONENTS Core Widgets Gui Network LinguistTools Concurrent
+        REQUIRED)
+    find_package(QT NAMES Qt6 REQUIRED) # used to get version number in QT_VERSION_MAJOR and QT_VERSION
 
-find_package(Qt5 ${QT_REQUIRED_VERSION} 
+    QT_WRAP_UI(antimicrox_FORMS_HEADERS ${antimicrox_FORMS})
+    QT_ADD_RESOURCES(antimicrox_RESOURCES_RCC ${antimicrox_RESOURCES})
+else()
+    find_package(Qt5 ${QT_REQUIRED_VERSION} 
         COMPONENTS Core Widgets Gui Network LinguistTools Concurrent
         REQUIRED)
+    find_package(QT NAMES Qt5 REQUIRED) # used to get version number in QT_VERSION_MAJOR and QT_VERSION
+
+    QT5_WRAP_UI(antimicrox_FORMS_HEADERS ${antimicrox_FORMS})
+    QT5_ADD_RESOURCES(antimicrox_RESOURCES_RCC ${antimicrox_RESOURCES})
+endif()
+message("Found QT: ${QT_VERSION}")
 
-QT5_WRAP_UI(antimicrox_FORMS_HEADERS ${antimicrox_FORMS})
-QT5_ADD_RESOURCES(antimicrox_RESOURCES_RCC ${antimicrox_RESOURCES})
 add_subdirectory("share/antimicrox/translations")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 

share/antimicrox/translations/CMakeLists.txt

@@ -6,19 +6,27 @@ file(GLOB_RECURSE antimicrox_BASE_SOURCES ${PROJECT_SOURCE_DIR}/src/*.cpp)
 file(GLOB_RECURSE antimicrox_BASE_FORMS ${PROJECT_SOURCE_DIR}/src/*.ui)
 
 
-if(UPDATE_TRANSLATIONS)
-    message("Update translations - lupdate ON")
-    if(TRANS_REMOVE_OBSOLETE)
-        message("getting rid of old text entries: \"lupdate -noobsolete\" ON")
-        QT5_CREATE_TRANSLATION(antimicrox_QMFILES ${antimicrox_BASE_SOURCES}
-                ${antimicrox_BASE_FORMS} ${antimicrox_TRANSLATIONS} OPTIONS -no-obsolete)
+if(QT_VERSION VERSION_GREATER_EQUAL 5.15)
+    if(UPDATE_TRANSLATIONS)
+        message("Update translations - lupdate ON")
+        if(TRANS_REMOVE_OBSOLETE)
+            message("getting rid of old text entries: \"lupdate -noobsolete\" ON")
+            QT_CREATE_TRANSLATION(antimicrox_QMFILES ${antimicrox_BASE_SOURCES}
+                    ${antimicrox_BASE_FORMS} ${antimicrox_TRANSLATIONS} OPTIONS -no-obsolete)
+        else()
+            QT_CREATE_TRANSLATION(antimicrox_QMFILES ${antimicrox_BASE_SOURCES}
+                    ${antimicrox_BASE_FORMS} ${antimicrox_TRANSLATIONS})
+        endif(TRANS_REMOVE_OBSOLETE)
     else()
-        QT5_CREATE_TRANSLATION(antimicrox_QMFILES ${antimicrox_BASE_SOURCES}
-                ${antimicrox_BASE_FORMS} ${antimicrox_TRANSLATIONS})
-    endif(TRANS_REMOVE_OBSOLETE)
+        QT_ADD_TRANSLATION(antimicrox_QMFILES ${antimicrox_TRANSLATIONS})
+    endif(UPDATE_TRANSLATIONS)
 else()
+    # Since 5.15 QT commands are universal
     QT5_ADD_TRANSLATION(antimicrox_QMFILES ${antimicrox_TRANSLATIONS})
-endif(UPDATE_TRANSLATIONS)
+    if(UPDATE_TRANSLATIONS)
+        warning("Updating translations only for QT 5.15 or newer.")
+    endif()
+endif()
 
 
 add_custom_target(updateqm DEPENDS ${antimicrox_QMFILES} COMMENT "Update translation files based on source and ui files")