Port to Qt6

Author: ximion

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 5.15.*
+        version: 6.8.*
 
     - name: Make vcpkg only build release builds
       run: |

CMakeLists.txt

@@ -8,7 +8,7 @@ project(PoMiDAQ
     VERSION 0.5.3
 )
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 enable_testing()
 
@@ -67,20 +67,21 @@ endif()
 #
 include(GNUInstallDirs)
 find_package(Threads)
-find_package(Qt5Core 5.12 REQUIRED)
-find_package(Qt5Concurrent 5.12 REQUIRED)
+find_package(Qt6Core 6.4 REQUIRED)
+find_package(Qt6Concurrent 6.4 REQUIRED)
 if (GUI)
-    find_package(Qt5Widgets 5.12 REQUIRED)
-    find_package(Qt5Svg 5.12 REQUIRED)
+    find_package(Qt6Widgets 6.4 REQUIRED)
+    find_package(Qt6OpenGLWidgets 6.4 REQUIRED)
+    find_package(Qt6Svg 6.4 REQUIRED)
 endif()
 
 find_package(OpenCV 4.2 REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(FFmpeg 58.35 REQUIRED COMPONENTS avcodec avutil avformat swscale)
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-    find_package(KF5ConfigWidgets)
-    set(KF5_ConfigWidgets KF5::ConfigWidgets)
+    find_package(KF6ConfigWidgets)
+    set(KF6_ConfigWidgets KF6::ConfigWidgets)
 endif()
 
 

README.md

@@ -72,7 +72,7 @@ If you want to cite PoMiDAQ, please use its Zenodo DOI:
 ### Dependencies
 
  * CMake (>= 3.16)
- * Qt5 (>= 5.12)
+ * Qt6 (>= 6.4)
  * FFmpeg (>= 4.1)
  * OpenCV (>= 4.1)
  * KF5ConfigWidgets (on Linux)
@@ -83,8 +83,8 @@ You should then be able to build the software after configuring the build with c
 
 On Debian-based Linux systems, all dependencies can be installed from the package repositories with this command:
 ```bash
-sudo apt install build-essential cmake ninja-build qtbase5-dev libqt5opengl5-dev \
-                 libkf5configwidgets-dev libopencv-dev libavcodec-dev libavformat-dev libswscale-dev \
+sudo apt install build-essential cmake ninja-build qt6-base-dev qt6-svg-dev \
+                 libkf6configwidgets-dev libopencv-dev libavcodec-dev libavformat-dev libswscale-dev \
                  pybind11-dev python3-dev python3-numpy
 ```
 The software can then be built like this, for an optimized release build with debug infos included:

contrib/ci/Dockerfile-debian

@@ -1,7 +1,7 @@
 #
 # Docker file for PoMiDAQ CI
 #
-FROM debian:bookworm
+FROM debian:trixie
 
 # prepare
 RUN apt-get update -qq
@@ -22,10 +22,9 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -yq --no-install-re
     cmake \
     ninja-build \
     appstream \
-    qtbase5-dev \
-    libqt5svg5-dev \
-    libqt5opengl5-dev \
-    libkf5configwidgets-dev \
+    qt6-base-dev \
+    qt6-svg-dev \
+    libkf6configwidgets-dev \
     libopencv-dev \
     libavcodec-dev \
     libavformat-dev \

contrib/ci/Dockerfile-ubuntu

@@ -5,11 +5,13 @@ FROM ubuntu:noble
 
 # prepare
 RUN apt-get update -qq
-RUN apt-get install -yq eatmydata
+RUN apt-get install -yq --no-install-recommends software-properties-common
+RUN add-apt-repository -y ppa:ximion/syntalos
+RUN apt-get update -qq
 
 # install build essentials
 RUN DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -yq \
-    build-essential gcc g++
+    build-essential eatmydata gcc g++
 
 # install build dependencies
 RUN DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -yq --no-install-recommends \
@@ -22,10 +24,9 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -yq --no-install-re
     cmake \
     ninja-build \
     appstream \
-    qtbase5-dev \
-    libqt5svg5-dev \
-    libqt5opengl5-dev \
-    libkf5configwidgets-dev \
+    qt6-base-dev \
+    qt6-svg-dev \
+    libkf6configwidgets-dev \
     libopencv-dev \
     libavcodec-dev \
     libavformat-dev \

contrib/debian/control

@@ -2,20 +2,20 @@ Source: pomidaq
 Section: science
 Priority: optional
 Maintainer: Matthias Klumpp <[email protected]>
-Build-Depends: appstream,
+Build-Depends: debhelper-compat (= 13),
+               appstream,
                cmake,
-               debhelper-compat (= 13),
                libavcodec-dev,
                libavformat-dev,
-               libkf5configwidgets-dev,
+               libkf6configwidgets-dev,
                libopencv-dev,
-               libqt5opengl5-dev,
-               libqt5svg5-dev,
                libswscale-dev,
                ninja-build,
                pybind11-dev,
                python3-dev,
                python3-numpy,
+               qt6-base-dev,
+               qt6-svg-dev,
                qtbase5-dev
 Standards-Version: 4.6.2
 

libminiscope/CMakeLists.txt

@@ -19,7 +19,7 @@ set(LIBMINISCOPE_HEADERS
     mediatypes.h
 )
 
-qt5_add_resources(LIBMINISCOPE_RES_SRC mscopelr.qrc)
+qt6_add_resources(LIBMINISCOPE_RES_SRC mscopelr.qrc)
 
 add_library(miniscope
     ${LIBMINISCOPE_SRC}
@@ -42,8 +42,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miniscope.pc DESTINATION "${CMAKE_INST
 
 target_link_libraries(miniscope
     ${CMAKE_THREAD_LIBS_INIT}
-    Qt5::Core
-    Qt5::Concurrent
+    Qt6::Core
+    Qt6::Concurrent
     ${OpenCV_LIBS}
     ${OPENGL_LIBRARIES}
     ${FFMPEG_LIBRARIES}

py/CMakeLists.txt

@@ -1,5 +1,6 @@
 # CMakeLists for PoMiDAQ Python module
 
+set(PYBIND11_FINDPYTHON ON)
 find_package(pybind11 REQUIRED)
 find_package(NumPy REQUIRED)
 

src/CMakeLists.txt

@@ -22,9 +22,9 @@ set(POMIDAQ_UI
     mainwindow.ui
 )
 
-qt5_wrap_ui(POMIDAQ_UI_SRC ${POMIDAQ_UI})
+qt6_wrap_ui(POMIDAQ_UI_SRC ${POMIDAQ_UI})
 
-qt5_add_resources(POMIDAQ_RES_SRC ../data/resources.qrc)
+qt6_add_resources(POMIDAQ_RES_SRC ../data/resources.qrc)
 
 add_executable(pomidaq
     ${GUI_TYPE}
@@ -35,9 +35,10 @@ add_executable(pomidaq
 
 target_link_libraries(pomidaq
     ${CMAKE_DL_LIBS}
-    Qt5::Widgets
-    Qt5::Svg
-    ${KF5_ConfigWidgets}
+    Qt6::Widgets
+    Qt6::OpenGLWidgets
+    Qt6::Svg
+    ${KF6_ConfigWidgets}
     ${OpenCV_LIBS}
     ${OPENGL_LIBRARIES}
     miniscope

src/mainwindow.cpp

@@ -214,7 +214,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     // Miniscope controls
     m_controlsLayout = new QVBoxLayout(ui->gbDeviceCtls);
-    m_controlsLayout->setMargin(2);
+    m_controlsLayout->setContentsMargins(2, 2, 2, 2);
     m_controlsLayout->setSpacing(4);
     ui->gbDeviceCtls->setLayout(m_controlsLayout);
     m_controlsLayout->addStretch();
@@ -381,7 +381,7 @@ void MainWindow::queueLogMessage(const QString &msg)
 {
     QMetaObject::invokeMethod(
         this,
-        [=]() {
+        [this, msg]() {
             writeLogMessage(msg);
         },
         Qt::QueuedConnection);
@@ -429,7 +429,7 @@ void MainWindow::setUseUnixTimestamps(bool useUnixTimestamp)
 void MainWindow::on_deviceTypeComboBox_currentIndexChanged(const QString &arg1)
 {
     // clear previous controls
-    for (const auto &control : qAsConst(m_controls))
+    for (const auto &control : std::as_const(m_controls))
         delete control;
     m_controls.clear();
 
@@ -546,7 +546,7 @@ void MainWindow::on_btnDevConnect_clicked()
     m_mscope->setUseUnixTimestamps(m_useUnixTimestamps);
 
     // reflect currently active control values in the UI
-    for (const auto &w : qAsConst(m_controls))
+    for (const auto &w : std::as_const(m_controls))
         w->setValue(m_mscope->controlValue(w->controlId()));
 
     // run and display images

src/mscontrolwidget.cpp

@@ -32,7 +32,7 @@ MSControlWidget::MSControlWidget(const MScope::ControlDefinition &ctlDef, QWidge
     m_controlId = ctlDef.id;
 
     const auto layout = new QVBoxLayout(this);
-    layout->setMargin(2);
+    layout->setContentsMargins(2, 2, 2, 2);
     layout->setSpacing(2);
 
     auto lblTitle = new QLabel(this);
@@ -44,7 +44,7 @@ MSControlWidget::MSControlWidget(const MScope::ControlDefinition &ctlDef, QWidge
         const auto selLayout = new QGridLayout(sc);
         const auto valuesCount = ctlDef.labels.length();
         m_slider = new QSlider(Qt::Horizontal, sc);
-        selLayout->setMargin(0);
+        selLayout->setContentsMargins(0, 0, 0, 0);
         selLayout->setSpacing(2);
 
         m_slider->setRange(ctlDef.valueMin, ctlDef.valueMax);
@@ -68,7 +68,7 @@ MSControlWidget::MSControlWidget(const MScope::ControlDefinition &ctlDef, QWidge
     } else {
         const auto slw = new QWidget(this);
         auto slLayout = new QHBoxLayout(slw);
-        slLayout->setMargin(0);
+        slLayout->setContentsMargins(0, 0, 0, 0);
         slLayout->setSpacing(2);
 
         m_slider = new QSlider(Qt::Horizontal, slw);