Commit ff6dab99 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent c8b75e1b
Pipeline #117545 passed with stage
in 37 seconds
......@@ -13,7 +13,7 @@ set(KJUMPINGCUBE_VERSION "${KJUMPINGCUBE_BASE_VERSION}.${RELEASE_SERVICE_COMPACT
project(kjumpingcube VERSION ${KJUMPINGCUBE_VERSION})
set (QT_MIN_VERSION "5.15.0")
set (KF5_MIN_VERSION "5.85.0")
set (KF5_MIN_VERSION "5.90.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
......@@ -28,7 +28,8 @@ include(ECMQtDeclareLoggingCategory)
include(ECMSetupVersion)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
find_package(Qt${QT_MAJOR_VERSION}QuickWidgets ${REQUIRED_QT_VERSION} CONFIG)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
Config
......
......@@ -52,7 +52,7 @@ target_link_libraries(kjumpingcube
KF5::DBusAddons
KF5::KIOWidgets
KF5::XmlGui
Qt::Svg
Qt${QT_MAJOR_VERSION}::Svg
)
install(TARGETS kjumpingcube ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -17,6 +17,7 @@
#include "kjumpingcube_debug.h"
#include <QFileDialog>
#include <QTemporaryFile>
#include <QRegExp>
#include <KConfigDialog> // IDW test.
#include <KIO/CopyJob>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment