Commit 4ce08888 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Time to increase kf5. Now we depend against kf5.85

parent 550e945d
......@@ -8,10 +8,6 @@ set (RELEASE_SERVICE_VERSION_MICRO "70")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
set(PROJECT_VERSION ${RELEASE_SERVICE_VERSION})
# At least C++14 is required
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(ECM REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR})
include(KDEInstallDirs)
......@@ -20,7 +16,7 @@ include(KDECompilerSettings)
include(FindPkgConfig)
include(FeatureSummary)
set(KF5_MIN_VERSION "5.83.0")
set(KF5_MIN_VERSION "5.85.0")
find_package(Qt5 5.15 REQUIRED COMPONENTS Core)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
......
......@@ -219,11 +219,11 @@ void KKameraConfig::load(void)
qCDebug(KAMERA_KCONTROL) << "Loading configuration for serial port camera: "
<< *it;
kcamera = new KCamera(*it, cg.readEntry("Path"));
connect(kcamera, qOverload<const QString&>(&KCamera::error),
this, qOverload<const QString&>(&KKameraConfig::slot_error));
  • Why this change? Generally speaking qOverload is a bit shorter and the preferred syntax

  • Because it doesn't build. No idea yet why it doesn't build with QOverload.

  • qOverload requires C++14 AFAIK, which you have removed in this commit

  • yep but ecm 5.85 provides directly c++17

  • find_package(ECM REQUIRED NO_MODULE)
    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR})

    You have not specified any version for ECM, consequently the described behavior won't be triggered.

  • Wierd I tried it yesterday but indeed now it works. thanks

Please register or sign in to reply
connect(kcamera, QOverload<const QString&>::of(&KCamera::error),
this, QOverload<const QString&>::of(&KKameraConfig::slot_error));
connect(kcamera, qOverload<const QString&, const QString&>(&KCamera::error),
this, qOverload<const QString&, const QString&>(&KKameraConfig::slot_error));
connect(kcamera, QOverload<const QString&, const QString&>::of(&KCamera::error),
this, QOverload<const QString&, const QString&>::of(&KKameraConfig::slot_error));
kcamera->load(m_config);
m_devices[*it] = kcamera;
......@@ -266,11 +266,11 @@ void KKameraConfig::load(void)
kcamera = new KCamera(portit.value(), portit.key());
connect(kcamera, qOverload<const QString&>(&KCamera::error),
this, qOverload<const QString&>(&KKameraConfig::slot_error));
connect(kcamera, QOverload<const QString&>::of(&KCamera::error),
this, QOverload<const QString&>::of(&KKameraConfig::slot_error));
connect(kcamera, qOverload<const QString&, const QString&>(&KCamera::error),
this, qOverload<const QString&, const QString&>(&KKameraConfig::slot_error));
connect(kcamera, QOverload<const QString&, const QString&>::of(&KCamera::error),
this, QOverload<const QString&, const QString&>::of(&KKameraConfig::slot_error));
m_devices[portit.value()] = kcamera;
}
......@@ -326,11 +326,11 @@ QString KKameraConfig::suggestName(const QString &name)
void KKameraConfig::slot_addCamera()
{
KCamera *m_device = new KCamera(QString(), QString());
connect(m_device, qOverload<const QString&>(&KCamera::error),
this, qOverload<const QString&>(&KKameraConfig::slot_error));
connect(m_device, QOverload<const QString&>::of(&KCamera::error),
this, QOverload<const QString&>::of(&KKameraConfig::slot_error));
connect(m_device, qOverload<const QString&, const QString&>(&KCamera::error),
this, qOverload<const QString&, const QString&>(&KKameraConfig::slot_error));
connect(m_device, QOverload<const QString&, const QString&>::of(&KCamera::error),
this, QOverload<const QString&, const QString&>::of(&KKameraConfig::slot_error));
KameraDeviceSelectDialog dialog(this, m_device);
if (dialog.exec() == QDialog::Accepted) {
......
......@@ -300,11 +300,11 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *dev
setModal( true );
m_device = device;
connect(m_device, qOverload<const QString&>(&KCamera::error),
this, qOverload<const QString&>(&KameraDeviceSelectDialog::slot_error));
connect(m_device, QOverload<const QString&>::of(&KCamera::error),
this, QOverload<const QString&>::of(&KameraDeviceSelectDialog::slot_error));
connect(m_device, qOverload<const QString&, const QString&>(&KCamera::error),
this, qOverload<const QString&, const QString&>(&KameraDeviceSelectDialog::slot_error));
connect(m_device, QOverload<const QString&, const QString&>::of(&KCamera::error),
this, QOverload<const QString&, const QString&>::of(&KameraDeviceSelectDialog::slot_error));
QWidget *page = new QWidget( this );
......
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