Commit b1079198 authored by Heiko Becker's avatar Heiko Becker 🏃
Browse files

Fix build with Qt >= 5.15.0-beta3

46ebd11e6 in qtbase removed the (int, QString) overload again and
un-deprecated the int overload.
parent e0120f7f
......@@ -64,11 +64,7 @@ GeneralConfigurationWidget::GeneralConfigurationWidget()
startupLogMode->addItem(logMode->icon(), logMode->name(), QVariant(logMode->id()));
}
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(startupLogMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &GeneralConfigurationWidget::configurationChanged);
#else
connect(startupLogMode, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &GeneralConfigurationWidget::configurationChanged);
#endif
connect(maxLines, QOverload<int>::of(&QSpinBox::valueChanged), this, &GeneralConfigurationWidget::configurationChanged);
connect(deleteDuplicatedLines, &QAbstractButton::clicked, this, &GeneralConfigurationWidget::configurationChanged);
......
......@@ -79,11 +79,7 @@ StatusBar::StatusBar(QWidget *parent)
d->messageList = new KComboBox(this);
d->messageList->setInsertPolicy(QComboBox::InsertAtTop);
d->messageList->setMaxVisibleItems(5);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->messageList, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &StatusBar::selectLastHistory);
#else
connect(d->messageList, QOverload<int, const QString &>::of(&KComboBox::currentIndexChanged), this, &StatusBar::selectLastHistory);
#endif
/*
//TODO Define a specifical palette (and make it works !)
QPalette palette(d->messageList->palette());
......
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