Commit 12c8e6b5 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 483e35dd
...@@ -37,11 +37,7 @@ BrowserWidget::BrowserWidget(QWidget *parent) : QWidget(parent) ...@@ -37,11 +37,7 @@ BrowserWidget::BrowserWidget(QWidget *parent) : QWidget(parent)
connect(showCurrentButton, &QPushButton::clicked, this, &BrowserWidget::showCurrentTranslation); connect(showCurrentButton, &QPushButton::clicked, this, &BrowserWidget::showCurrentTranslation);
setupProviders(); setupProviders();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(providerComboBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &BrowserWidget::providerChanged); connect(providerComboBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &BrowserWidget::providerChanged);
#else
connect(providerComboBox, static_cast<void (KComboBox::*)(int, const QString &)>(&KComboBox::currentIndexChanged) , this, &BrowserWidget::providerChanged);
#endif
} }
......
...@@ -35,11 +35,7 @@ DeclensionWidget::DeclensionWidget(QWidget *parent) : QWidget(parent) ...@@ -35,11 +35,7 @@ DeclensionWidget::DeclensionWidget(QWidget *parent) : QWidget(parent)
numberSelection->setItemData(0, KEduVocWordFlag::Singular); numberSelection->setItemData(0, KEduVocWordFlag::Singular);
numberSelection->setItemData(1, KEduVocWordFlag::Dual); numberSelection->setItemData(1, KEduVocWordFlag::Dual);
numberSelection->setItemData(2, KEduVocWordFlag::Plural); numberSelection->setItemData(2, KEduVocWordFlag::Plural);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(numberSelection, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &DeclensionWidget::updateEntries); connect(numberSelection, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &DeclensionWidget::updateEntries);
#else
connect(numberSelection, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &DeclensionWidget::updateEntries);
#endif
connect(nextButton, &QPushButton::clicked, this, &DeclensionWidget::nextNumber); connect(nextButton, &QPushButton::clicked, this, &DeclensionWidget::nextNumber);
......
...@@ -210,11 +210,7 @@ void StatisticsMainWindow::initPracticeMode() ...@@ -210,11 +210,7 @@ void StatisticsMainWindow::initPracticeMode()
Prefs::setPracticeDirection(Prefs::EnumPracticeDirection::MixedDirectionsWordsOnly); Prefs::setPracticeDirection(Prefs::EnumPracticeDirection::MixedDirectionsWordsOnly);
m_ui->practiceDirection->setCurrentIndex(practiceDirection); m_ui->practiceDirection->setCurrentIndex(practiceDirection);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_ui->practiceDirection, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), connect(m_ui->practiceDirection, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
#else
connect(m_ui->practiceDirection, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) ,
#endif
this, &StatisticsMainWindow::practiceDirectionChanged); this, &StatisticsMainWindow::practiceDirectionChanged);
m_ui->rememberPracticeDirection->setChecked(Prefs::rememberPracticeDirection()); m_ui->rememberPracticeDirection->setChecked(Prefs::rememberPracticeDirection());
......
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