Commit f74b0816 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 a084d9f7
......@@ -84,11 +84,7 @@ MergeContactWidget::MergeContactWidget(QWidget *parent)
mCollectionCombobox->setMinimumWidth(250);
mCollectionCombobox->setMimeTypeFilter(QStringList() << KContacts::Addressee::mimeType());
mCollectionCombobox->setObjectName(QStringLiteral("akonadicombobox"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &MergeContactWidget::slotUpdateMergeButton);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &MergeContactWidget::slotUpdateMergeButton);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &MergeContactWidget::slotUpdateMergeButton);
hbox->addWidget(mCollectionCombobox);
......
......@@ -73,11 +73,7 @@ SearchDuplicateResultWidget::SearchDuplicateResultWidget(QWidget *parent)
mCollectionCombobox->setMinimumWidth(250);
mCollectionCombobox->setMimeTypeFilter(QStringList() << KContacts::Addressee::mimeType());
mCollectionCombobox->setObjectName(QStringLiteral("akonadicombobox"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &SearchDuplicateResultWidget::slotUpdateMergeButton);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &SearchDuplicateResultWidget::slotUpdateMergeButton);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &SearchDuplicateResultWidget::slotUpdateMergeButton);
mergeLayout->addWidget(mCollectionCombobox);
......
......@@ -60,11 +60,7 @@ AutomaticAddContactsTabWidget::AutomaticAddContactsTabWidget(QWidget *parent, QA
mCollectionCombobox->setObjectName(QStringLiteral("akonadicombobox"));
hlay->addWidget(mCollectionCombobox);
hlay->addStretch(1);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &AutomaticAddContactsTabWidget::configureChanged);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &AutomaticAddContactsTabWidget::configureChanged);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &AutomaticAddContactsTabWidget::configureChanged);
mainLayout->addStretch(1);
......
......@@ -83,11 +83,7 @@ EventEdit::EventEdit(QWidget *parent)
#endif
mCollectionCombobox->setToolTip(i18n("Calendar where the new event will be stored"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &EventEdit::slotCollectionChanged);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &EventEdit::slotCollectionChanged);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &EventEdit::slotCollectionChanged);
connect(mCollectionCombobox->model(), &QAbstractItemModel::rowsInserted, this, &EventEdit::comboboxRowInserted);
......
......@@ -75,11 +75,7 @@ NoteEdit::NoteEdit(QWidget *parent)
mCollectionCombobox->setAccessibleDescription(i18n("Calendar where the new event will be stored."));
#endif
mCollectionCombobox->setToolTip(i18n("Calendar where the new event will be stored"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &NoteEdit::slotCollectionChanged);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &NoteEdit::slotCollectionChanged);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &NoteEdit::slotCollectionChanged);
hbox->addWidget(mCollectionCombobox);
......
......@@ -91,11 +91,7 @@ TodoEdit::TodoEdit(QWidget *parent)
mCollectionCombobox->setAccessibleDescription(i18n("Todo list where the new task will be stored."));
#endif
mCollectionCombobox->setToolTip(i18n("Todo list where the new task will be stored"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &TodoEdit::slotCollectionChanged);
#else
connect(mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &TodoEdit::slotCollectionChanged);
#endif
connect(mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::activated), this, &TodoEdit::slotCollectionChanged);
hbox->addWidget(mCollectionCombobox);
......
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