Commit b3a03e48 authored by David Jarvie's avatar David Jarvie
Browse files

Fix build warnings using Qt5.15

parent 6573afbb
Pipeline #24759 passed with stage
in 10 minutes and 56 seconds
......@@ -12,7 +12,6 @@ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${kalarm_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
include(ECMInstallIcons)
include(ECMSetupVersion)
include(ECMAddTests)
......@@ -120,7 +119,7 @@ add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054700)
......
......@@ -30,11 +30,8 @@
#include <QTimer>
#include <QFrame>
#include <QBrush>
#include <QStyle>
#include <QObject>
#include <QApplication>
#include <QPixmap>
#include <QMatrix>
#include <stdlib.h>
......@@ -549,9 +546,9 @@ void SpinMirror::setMirroredState(bool clear)
{
// Some styles only look right when the buttons are mirrored
if (mMirrored)
setMatrix(QMatrix(-1, 0, 0, 1, width() - 1 , 0)); // mirror left to right
setTransform(QTransform(-1, 0, 0, 1, width() - 1 , 0)); // mirror left to right
else if (clear)
setMatrix(QMatrix());
setTransform(QTransform());
}
void SpinMirror::setFrame()
......
......@@ -258,7 +258,7 @@ DirResourceImportTypeWidget::DirResourceImportTypeWidget(CalEvent::Type alarmTyp
mUi->mergeResource->addItem(resource.displayName(), QVariant(resource.id()));
}
connect(mUi->optionGroup, QOverload<int, bool>::of(&QButtonGroup::buttonToggled), this, &DirResourceImportTypeWidget::importTypeSelected);
connect(mUi->optionGroup, QOverload<QAbstractButton*, bool>::of(&QButtonGroup::buttonToggled), this, &DirResourceImportTypeWidget::importTypeSelected);
mUi->pathRequester->setMode(KFile::File);
mUi->pathRequester->setFilter(QStringLiteral("*.ics|%1").arg(i18nc("@item:inlistbox File type selection filter", "Calendar files")));
......
......@@ -53,7 +53,7 @@ SingleFileResourceConfigDialog::SingleFileResourceConfigDialog(bool create, QWid
mUi->pathRequester->setFocus();
mUi->statusLabel->setText(QString());
connect(mUi->pathRequester, &KUrlRequester::textChanged, this, &SingleFileResourceConfigDialog::validate);
connect(mUi->alarmTypeGroup, QOverload<int, bool>::of(&QButtonGroup::buttonToggled), this, &SingleFileResourceConfigDialog::validate);
connect(mUi->alarmTypeGroup, QOverload<QAbstractButton*, bool>::of(&QButtonGroup::buttonToggled), this, &SingleFileResourceConfigDialog::validate);
}
else
{
......
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