Remove Qt5 support

Author: DanielNicolettiKDAB

.github/workflows/build-external-graphviz.yml

@@ -67,7 +67,6 @@ jobs:
           --warn-uninitialized -Werror=dev
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -DCMAKE_OSX_ARCHITECTURES="arm64"
-          -DKDSME_QT6=ON
           -DBUILD_TESTING=${{ matrix.build_type == 'Debug' }}
           -DKDSME_EXAMPLES=ON
           -DKDSME_DOCS=${{ matrix.build_type == 'Debug' && runner.os == 'Linux' }}

.github/workflows/build.yml

@@ -29,9 +29,6 @@ jobs:
           - Shared
           - Static
         config:
-          - qt_version: 5.15.2
-            qt_arch: win64_msvc2019_64
-            macos_architectures: "x86_64"
           - qt_version: 6.6.2
             qt_modules: qtscxml
             qt_arch: win64_msvc2019_64
@@ -99,7 +96,6 @@ jobs:
           --warn-uninitialized -Werror=dev
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -DCMAKE_OSX_ARCHITECTURES="${{ matrix.config.macos_architectures }}"
-          -DKDSME_QT6=${{ startsWith(matrix.config.qt_version, '6.') }}
           -DBUILD_TESTING=${{ matrix.build_type == 'Debug' }}
           -DKDSME_EXAMPLES=ON
           -DKDSME_DOCS=${{ matrix.build_type == 'Debug' && runner.os == 'Linux' }}

CMakeLists.txt

@@ -28,10 +28,6 @@
 #  Currently shared graphviz builds on Windows have link issues.
 #  Default=true
 #
-# -DKDSME_QT6=[true|false]
-#  Build against Qt6 rather than Qt5
-#  Default=true
-#
 # -DKDSME_DOCS=[true|false]
 #  Build the documentation. Documentation is never built when cross-compiling.
 #  Default=true
@@ -100,9 +96,6 @@ renamed_option(BUILD_DOCS KDSME_DOCS)
 renamed_option(BUILD_EXAMPLES KDSME_EXAMPLES)
 renamed_option(BUILD_TESTS BUILD_TESTING)
 
-option(KDSME_QT6 "Build against Qt 6" ON)
-renamed_option(BUILD_QT6 KDSME_QT6)
-
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -124,20 +117,13 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-if(KDSME_QT6)
-    set(QT_VERSION_MAJOR 6)
-    set(QT_MIN_VERSION "6.1.0")
-    find_package(
-        Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick QuickControls2 QuickWidgets Test Widgets StateMachine
-    )
-    set(KDSME_LIBRARY_QTID "-qt6")
-else()
-    set(QT_VERSION_MAJOR 5)
-    set(QT_MIN_VERSION "5.15")
-    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick QuickWidgets Test Widgets)
-    set(KDSME_LIBRARY_QTID "")
-    include(ECMGeneratePriFile)
-endif()
+set(QT_VERSION_MAJOR 6)
+set(QT_MIN_VERSION "6.1.0")
+find_package(
+    Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick QuickControls2 QuickWidgets Test Widgets StateMachine
+)
+set(KDSME_LIBRARY_QTID "-qt6")
+
 include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
 
 find_package(Qt${QT_VERSION_MAJOR}RemoteObjects ${QT_MIN_VERSION} CONFIG QUIET)
@@ -156,17 +142,6 @@ set_package_properties(
     PURPOSE "Needed for the Qt SCXML adapter (adapter itself depends on Qt RemoteObjects)"
 )
 
-# QtXmlPatterns is removed since Qt6
-if(NOT KDSME_QT6)
-    find_package(Qt5XmlPatterns ${QT_MIN_VERSION} CONFIG QUIET)
-    set_package_properties(
-        Qt5XmlPatterns PROPERTIES
-        TYPE OPTIONAL
-        DESCRIPTION "Qt5 XmlPatterns library"
-        PURPOSE "Required with Qt5 for unit tests dealing with XML input/output"
-    )
-endif()
-
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckIncludeFiles)
@@ -210,11 +185,9 @@ set(LIB_INSTALL_DIR
     ${CMAKE_INSTALL_LIBDIR}
     CACHE STRING "Library install destination."
 )
-if(KDSME_QT6)
-    set(INCLUDE_INSTALL_ROOT ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}${KDSME_LIBRARY_QTID})
-else()
-    set(INCLUDE_INSTALL_ROOT ${CMAKE_INSTALL_INCLUDEDIR}/)
-endif()
+
+set(INCLUDE_INSTALL_ROOT ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}${KDSME_LIBRARY_QTID})
+
 set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT}/${CMAKE_PROJECT_NAME})
 set(XDG_DATA_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME})
 
@@ -310,13 +283,6 @@ if((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND NOT
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wextra -Woverloaded-virtual -Winit-self")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-include-dirs -Wunused -Wno-div-by-zero -Wundef")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith -Wmissing-noreturn -Werror=return-type -Wswitch")
-    if(NOT KDSME_QT6)
-        if(HAVE_GXX_GNUXX11) # QNX needs gnu++0x rather than c++0x for compiling QML V4 private headers
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-        elseif(HAVE_GXX_CXX11)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-        endif()
-    endif()
     if(MINGW)
         # mingw will error out on the crazy casts in probe.cpp without this
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
@@ -339,7 +305,7 @@ add_definitions(
     -DQT_USE_QSTRINGBUILDER
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_USE_FAST_OPERATOR_PLUS
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
+    -DQT_DISABLE_DEPRECATED_BEFORE=0x060900
 )
 
 if(MSVC)

CMakePresets.json

@@ -35,33 +35,12 @@
                 "dev": false
             }
         },
-        {
-            "name": "dev5-external-graphviz",
-            "description": "Qt5 dev build with external graphviz",
-            "inherits": "dev-base",
-            "binaryDir": "${sourceDir}/build-dev5-external-graphviz",
-            "cacheVariables": {
-                "KDSME_QT6": "OFF",
-                "KDSME_INTERNAL_GRAPHVIZ": "OFF"
-            }
-        },
-        {
-            "name": "dev5",
-            "description": "Qt5 dev build",
-            "inherits": "dev-base",
-            "binaryDir": "${sourceDir}/build-dev5",
-            "cacheVariables": {
-                "KDSME_QT6": "OFF",
-                "KDSME_INTERNAL_GRAPHVIZ": "ON"
-            }
-        },
         {
             "name": "dev6-external-graphviz",
             "description": "Qt6 dev build with external graphviz",
             "inherits": "dev-base",
             "binaryDir": "${sourceDir}/build-dev6-external-graphviz",
             "cacheVariables": {
-                "KDSME_QT6": "ON",
                 "KDSME_INTERNAL_GRAPHVIZ": "OFF"
             }
         },
@@ -71,38 +50,6 @@
             "inherits": "dev-base",
             "binaryDir": "${sourceDir}/build-dev6",
             "cacheVariables": {
-                "KDSME_QT6": "ON",
-                "KDSME_INTERNAL_GRAPHVIZ": "ON"
-            }
-        },
-        {
-            "name": "rel-base",
-            "description": "rel-base",
-            "inherits": "base",
-            "hidden": true,
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
-                "KDSME_QT6": "OFF",
-                "BUILD_TESTING": "OFF"
-            }
-        },
-        {
-            "name": "rel5-external-graphviz",
-            "description": "Qt5 release build with external graphviz",
-            "inherits": "rel-base",
-            "binaryDir": "${sourceDir}/build-rel5-external-graphviz",
-            "cacheVariables": {
-                "KDSME_QT6": "OFF",
-                "KDSME_INTERNAL_GRAPHVIZ": "OFF"
-            }
-        },
-        {
-            "name": "rel5",
-            "description": "Qt5 release build",
-            "inherits": "rel-base",
-            "binaryDir": "${sourceDir}/build-rel5",
-            "cacheVariables": {
-                "KDSME_QT6": "OFF",
                 "KDSME_INTERNAL_GRAPHVIZ": "ON"
             }
         },
@@ -112,7 +59,6 @@
             "inherits": "rel-base",
             "binaryDir": "${sourceDir}/build-rel6-external-graphviz",
             "cacheVariables": {
-                "KDSME_QT6": "ON",
                 "KDSME_INTERNAL_GRAPHVIZ": "OFF"
             }
         },
@@ -122,7 +68,6 @@
             "inherits": "rel-base",
             "binaryDir": "${sourceDir}/build-rel6",
             "cacheVariables": {
-                "KDSME_QT6": "ON",
                 "KDSME_INTERNAL_GRAPHVIZ": "ON"
             }
         },

src/core/CMakeLists.txt

@@ -82,13 +82,10 @@ add_library(KDSME::Core ALIAS kdstatemachineeditor_core)
 target_link_libraries(
     kdstatemachineeditor_core
     PRIVATE Qt${QT_VERSION_MAJOR}::Quick # TODO: Get rid off this
+            Qt6::StateMachine
     PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui
 )
 
-if(KDSME_QT6)
-    target_link_libraries(kdstatemachineeditor_core PRIVATE Qt6::StateMachine)
-endif()
-
 if(NOT KDSME_INTERNAL_GRAPHVIZ)
     target_include_directories(kdstatemachineeditor_core PRIVATE ${GRAPHVIZ_INCLUDE_DIR})
 endif()
@@ -189,22 +186,6 @@ install(
     DESTINATION ${INCLUDE_INSTALL_DIR}/core
 )
 
-if(NOT KDSME_QT6)
-    ecm_generate_pri_file(
-        BASE_NAME
-        KDSMECore
-        LIB_NAME
-        kdstatemachineeditor_core
-        DEPS
-        "core gui"
-        FILENAME_VAR
-        PRI_FILENAME
-        INCLUDE_INSTALL_DIR
-        ${INCLUDE_INSTALL_DIR}/core
-    )
-    install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
-
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()

src/core/tests/CMakeLists.txt

@@ -14,12 +14,6 @@
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-test.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-test.h)
 
-# QtXmlPatterns fails badly on OSX -- see https://bugreports.qt-project.org/browse/QTBUG-40818
-if(TARGET Qt5::XmlPatterns_FOUND AND NOT APPLE)
-    add_definitions(-DUSE_QT_XMLPATTERNS_LIB)
-    list(APPEND KDSME_TESTHELPER_EXTRA_LIBS Qt5::XmlPatterns)
-endif()
-
 add_library(kdsme_testhelper STATIC parsehelper.cpp util.cpp)
 target_link_libraries(kdsme_testhelper Qt::Test kdstatemachineeditor_core)
 
@@ -35,24 +29,19 @@ ecm_add_test(test_qmlexport.cpp LINK_LIBRARIES kdsme_testhelper)
 
 if(TARGET Qt::RemoteObjects)
     set(SRCS test_qsmintegration.cpp)
-    if(NOT KDSME_QT6)
-        qt_generate_repc(SRCS ../../debuginterface/debuginterface.rep REPLICA)
-    endif()
     ecm_add_test(
         ${SRCS}
         TEST_NAME
         test_qsmintegration
         LINK_LIBRARIES
         Qt::RemoteObjects
         Qt::Test
+        Qt::StateMachine
         kdstatemachineeditor_debuginterfaceclient
         kdstatemachineeditor_debuginterfacesource
         kdsme_testhelper
     )
-    if(KDSME_QT6)
-        target_link_libraries(test_qsmintegration Qt6::StateMachine)
-        qt_add_repc_replicas(test_qsmintegration ../../debuginterface/debuginterface.rep)
-    endif()
+    qt_add_repc_replicas(test_qsmintegration ../../debuginterface/debuginterface.rep)
 endif()
 
 ecm_add_test(test_scxmlimport.cpp LINK_LIBRARIES kdsme_testhelper)

src/core/tests/test_scxmlexport.cpp

@@ -22,11 +22,6 @@
 #include <QDebug>
 #include <QTest>
 
-#ifdef USE_QT_XMLPATTERNS_LIB
-#include <QBuffer>
-#include <QXmlQuery>
-#endif
-
 #define QVERIFY_RETURN(statement, retval)                                     \
     do {                                                                      \
         if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__)) \
@@ -35,27 +30,6 @@
 
 using namespace KDSME;
 
-namespace {
-
-#ifdef USE_QT_XMLPATTERNS_LIB
-QStringList query(QByteArray xml, const QString &sourceCode)
-{
-    static const QString preamble =
-        "declare default element namespace \"http://www.w3.org/2005/07/scxml\";";
-
-    QBuffer buffer(&xml);
-    buffer.open(QIODevice::ReadOnly);
-    QXmlQuery query;
-    query.bindVariable("input", &buffer);
-    query.setQuery(preamble + sourceCode);
-    QStringList result;
-    query.evaluateTo(&result);
-    return result;
-}
-#endif
-
-}
-
 class ScxmlExportTest : public QObject
 {
     Q_OBJECT
@@ -107,18 +81,6 @@ void ScxmlExportTest::testSimpleStateMachine()
     const bool success = exporter.exportMachine(&root);
     QVERIFY(success);
     QVERIFY(!output.isEmpty());
-
-#ifdef USE_QT_XMLPATTERNS_LIB
-    QStringList stateMachineIds = query(output, "doc($input)/scxml/@name/string()");
-    QCOMPARE(stateMachineIds, QStringList() << "root");
-    QStringList stateIds = query(output, "doc($input)/scxml/state/@id/string()");
-    QCOMPARE(stateIds, QStringList() << "s1"
-                                     << "s2");
-    QStringList initialStateIds = query(output, "doc($input)/scxml/@initial/string()");
-    QCOMPARE(initialStateIds, QStringList() << "s1");
-    QStringList transitions = query(output, "doc($input)/scxml/state[@id='s1']/transition/@event/string()");
-    QCOMPARE(transitions, QStringList() << "e1");
-#endif
 }
 
 QTEST_MAIN(ScxmlExportTest)

src/view/CMakeLists.txt

@@ -118,22 +118,6 @@ install(
     DESTINATION ${INCLUDE_INSTALL_DIR}/view
 )
 
-if(NOT KDSME_QT6)
-    ecm_generate_pri_file(
-        BASE_NAME
-        KDSMEView
-        LIB_NAME
-        kdstatemachineeditor_view
-        DEPS
-        "core gui qml quickwidgets widgets KDSMECore"
-        FILENAME_VAR
-        PRI_FILENAME
-        INCLUDE_INSTALL_DIR
-        ${INCLUDE_INSTALL_DIR}/view
-    )
-    install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
-
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()

src/view/quick/quickmaskedmousearea.cpp

@@ -148,13 +148,8 @@ void QuickMaskedMouseArea::mouseReleaseEvent(QMouseEvent *event)
 
 
     const int threshold = qApp->styleHints()->startDragDistance();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     const int eventX = static_cast<int>(event->position().x());
     const int eventY = static_cast<int>(event->position().y());
-#else
-    const int eventX = event->x();
-    const int eventY = event->y();
-#endif
     const bool isClick = (threshold >= qAbs(eventX - m_pressPoint.x()) && threshold >= qAbs(eventY - m_pressPoint.y()));
 
     if (isClick)