Remove Qt5 from build and test environment

simoninns · simoninns · commit ef9c27bc0231 · 2025-12-08T10:24:34.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,51 +6,7 @@ on:
   release:
 
 jobs:
-  qt5:
-    name: Build with Qt 5
-    runs-on: ubuntu-22.04
-    steps:
-
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-        fetch-depth: 0
-
-    - uses: actions/checkout@v2
-      with:
-        repository: happycube/ld-decode-testdata
-        path: testdata
-
-    - name: Install dependencies
-      timeout-minutes: 10
-      run: |
-        sudo apt-get update
-        # Based on: https://github.com/happycube/ld-decode/wiki/Installation
-        # Added: cmake libqt5opengl5-dev libqt5svg5-dev
-        sudo apt-get install -y --no-install-recommends git cmake make python3-setuptools python3-numpy python3-scipy python3-matplotlib git libqt5opengl5-dev libqt5svg5-dev libqwt-qt5-dev libfftw3-dev python3-numba libavformat-dev libavcodec-dev libavutil-dev ffmpeg libsqlite3-dev libqt5sql5-sqlite
-
-    - name: Set up build dir
-      timeout-minutes: 1
-      run: mkdir obj
-
-    - name: Configure
-      timeout-minutes: 5
-      run: cd obj && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_QT_VERSION=5 ..
-
-    - name: Build
-      timeout-minutes: 15
-      run: make -C obj VERBOSE=1
-
-    - name: Install
-      timeout-minutes: 5
-      run: make -C obj install DESTDIR=/tmp/staging && ls -lR /tmp/staging
-
-    - name: Run tests
-      timeout-minutes: 10
-      run: cd obj && ctest --output-on-failure
-
   qt6:
-    # XXX This builds without Qwt as Ubuntu 22.04 doesn't have it for Qt 6
     name: Build with Qt 6
     runs-on: ubuntu-22.04
     steps:
@@ -79,7 +35,7 @@ jobs:
 
     - name: Configure
       timeout-minutes: 5
-      run: cd obj && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_QT_VERSION=6 -DUSE_QWT=OFF ..
+      run: cd obj && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 
     - name: Build
       timeout-minutes: 15
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,7 @@ DartConfiguration.tcl
 Makefile
 Testing/
 build-*/
+obj/
 cmake_install.cmake
 compile_commands.json
 install_manifest.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,10 +18,6 @@ if(MSVC)
     add_compile_options(/permissive-)
 endif()
 
-set(USE_QT_VERSION "" CACHE STRING
-    "Version of Qt to use, 5 or 6 (Which is used by default can vary due to how cmake find functions work, but will often default to Qt6)"
-)
-
 option(BUILD_LDF_READER
     "build ld_ldf_reader"
     ON
@@ -39,28 +35,9 @@ set(CMAKE_AUTOMOC ON)
 include(GNUInstallDirs)
 set(CMAKE_AUTOUIC ON)
 
-set(QT_PACKAGE_NAMES Qt5 Qt6)
-if(USE_QT_VERSION)
-    set(QT_PACKAGE_NAMES Qt${USE_QT_VERSION})
-endif()
-find_package(QT NAMES ${QT_PACKAGE_NAMES} REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Sql)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Sql)
 message(STATUS "Qt Version: ${QT_VERSION}")
 
-# For Qt < 5.15, emulate 5.15's Qt5CoreConfig.cmake, so we don't have to
-# specify Qt5/Qt6 elsewhere.
-if(QT_VERSION VERSION_LESS 5.15)
-    function(qt_add_resources outfiles)
-        qt5_add_resources("${outfiles}" ${ARGN})
-        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-    endfunction()
-    foreach(library Core Gui Widgets)
-        add_library(Qt::${library} INTERFACE IMPORTED)
-        set_target_properties(Qt::${library} PROPERTIES
-            INTERFACE_LINK_LIBRARIES "Qt5::${library}")
-    endforeach()
-endif()
-
 find_package(PkgConfig REQUIRED)
 
 if(NOT MSVC)
diff --git a/prototypes/ld-process-efm/CMakeLists.txt b/prototypes/ld-process-efm/CMakeLists.txt
@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 
 project(ld-process-efm)
 
-# Find Qt5
-find_package(Qt5 REQUIRED COMPONENTS Core)
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
 add_executable(ld-process-efm
     efmprocess.cpp
@@ -35,6 +34,6 @@ target_compile_definitions(ld-process-efm PRIVATE
     APP_COMMIT="unknown"
 )
 
-target_link_libraries(ld-process-efm PRIVATE Qt5::Core)
+target_link_libraries(ld-process-efm PRIVATE Qt6::Core)
 
 install(TARGETS ld-process-efm)
diff --git a/tools/efm-decoder/CMakeLists.txt b/tools/efm-decoder/CMakeLists.txt
@@ -3,33 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 # Set the project name
 project(efm-tools)
 
-# Handle Qt version selection - default to Qt5 for backward compatibility
-if(NOT DEFINED USE_QT_VERSION)
-    set(USE_QT_VERSION 5)
-endif()
-
-# Find Qt components based on version
-if(USE_QT_VERSION EQUAL 6)
-    find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
-    # Create aliases for compatibility
-    if(NOT TARGET Qt::Core AND TARGET Qt6::Core)
-        add_library(Qt::Core ALIAS Qt6::Core)
-    endif()
-    if(NOT TARGET Qt::Widgets AND TARGET Qt6::Widgets)
-        add_library(Qt::Widgets ALIAS Qt6::Widgets)
-    endif()
-    set(QT_VERSION_MAJOR 6)
-else()
-    find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
-    # Create aliases for modern CMake target names
-    if(NOT TARGET Qt::Core AND TARGET Qt5::Core)
-        add_library(Qt::Core ALIAS Qt5::Core)
-    endif()
-    if(NOT TARGET Qt::Widgets AND TARGET Qt5::Widgets)
-        add_library(Qt::Widgets ALIAS Qt5::Widgets)
-    endif()
-    set(QT_VERSION_MAJOR 5)
-endif()
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
 
 # Get the Git branch and revision
 execute_process(
