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

Merge remote-tracking branch 'origin/release/20.04'

parents 1c7fd09b 856e01e0
......@@ -27,7 +27,7 @@ include(ECMQtDeclareLoggingCategory)
# Do NOT add quote
set(KDEPIM_DEV_VERSION alpha)
set(KDEPIM_DEV_VERSION )
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
......
......@@ -53,11 +53,7 @@ JobTrackerSearchWidget::JobTrackerSearchWidget(QWidget *parent)
mSelectColumn->addItem(QStringLiteral("Job Type"), 4);
mSelectColumn->addItem(QStringLiteral("State"), 5);
mSelectColumn->addItem(QStringLiteral("Info"), 6);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mSelectColumn, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &JobTrackerSearchWidget::slotColumnChanged);
#else
connect(mSelectColumn, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &JobTrackerSearchWidget::slotColumnChanged);
#endif
}
JobTrackerSearchWidget::~JobTrackerSearchWidget()
......
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