From e891288b641aa52b3bcc069c884262aea23882df Mon Sep 17 00:00:00 2001 From: Rafael Sadowski Date: Sat, 13 Jan 2024 19:15:59 +0100 Subject: [PATCH 1/2] Switch from Qt5 to Qt6 by default - Fix compile with Qt6 --- CMakeLists.txt | 7 +++---- src/adaptors.h | 1 - src/disk_label.cpp | 2 +- src/manageradaptor.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 974de5f..c3a17b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16.0) # Version setup set(OPENBSDISKS_VERSION_MAJOR "0") -set(OPENBSDISKS_VERSION_MINOR "4") +set(OPENBSDISKS_VERSION_MINOR "5") set(OPENBSDISKS_VERSION_PATCH "0") set(OPENBSDISKS_VERSION "${OPENBSDISKS_VERSION_MAJOR}.${OPENBSDISKS_VERSION_MINOR}.${OPENBSDISKS_VERSION_PATCH}") @@ -25,8 +25,7 @@ option(INSTALL_MAN_PAGES "Install man pages" ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(QT5COMPONENTS Core DBus) -find_package(Qt5 COMPONENTS ${QT5COMPONENTS} REQUIRED) +find_package(Qt6 COMPONENTS Core DBus REQUIRED) find_package(Threads REQUIRED) set(SOURCE @@ -46,7 +45,7 @@ set(SOURCE ) add_executable(openbsdisks2 ${SOURCE}) -target_link_libraries(openbsdisks2 Qt5::DBus Qt5::Core util) +target_link_libraries(openbsdisks2 Qt6::DBus Qt6::Core util) target_compile_features(openbsdisks2 PRIVATE cxx_std_17) target_compile_options(openbsdisks2 PRIVATE "-Wall") diff --git a/src/adaptors.h b/src/adaptors.h index 5c14ce9..9f6c384 100644 --- a/src/adaptors.h +++ b/src/adaptors.h @@ -18,7 +18,6 @@ class QByteArray; template class QList; template class QMap; class QString; -class QStringList; class QVariant; #include diff --git a/src/disk_label.cpp b/src/disk_label.cpp index af8f780..9548dd6 100644 --- a/src/disk_label.cpp +++ b/src/disk_label.cpp @@ -84,7 +84,7 @@ void DiskLabel::analyseDev(const QString& dev) for (int i = 0; i < lab.d_npartitions; i++) { pp = &lab.d_partitions[i]; if (DL_GETPSIZE(pp) > 0) { - QString p('a' + i); + const QString p = QChar('a' + i); if (p != QStringLiteral("c")) { if (isValidFileSysetem(pp->p_fstype)) { auto block = createBlock( diff --git a/src/manageradaptor.h b/src/manageradaptor.h index 55d4b8a..ceeb339 100644 --- a/src/manageradaptor.h +++ b/src/manageradaptor.h @@ -17,8 +17,8 @@ class QByteArray; template class QList; template class QMap; + class QString; -class QStringList; class QVariant; typedef QMap QVariantMapMap; From 963fe798c4a5397400f5ab6f3aa0c30dab5f0ea2 Mon Sep 17 00:00:00 2001 From: Rafael Sadowski Date: Sat, 13 Jan 2024 19:19:51 +0100 Subject: [PATCH 2/2] Use QT_MAJOR_VERSION and set to 6 as default --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3a17b4..f0358ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE) FORCE) endif() +set(QT_MAJOR_VERSION 6 CACHE STRING "Qt version to use (5 or 6), defaults to 6") + include(GNUInstallDirs) option(INSTALL_POLKIT_RULES "Install polkit rules" OFF) @@ -25,7 +27,7 @@ option(INSTALL_MAN_PAGES "Install man pages" ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -find_package(Qt6 COMPONENTS Core DBus REQUIRED) +find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Core DBus REQUIRED) find_package(Threads REQUIRED) set(SOURCE @@ -45,7 +47,7 @@ set(SOURCE ) add_executable(openbsdisks2 ${SOURCE}) -target_link_libraries(openbsdisks2 Qt6::DBus Qt6::Core util) +target_link_libraries(openbsdisks2 Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Core util) target_compile_features(openbsdisks2 PRIVATE cxx_std_17) target_compile_options(openbsdisks2 PRIVATE "-Wall")