Commit 9034ef5c 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 eaf4b336
......@@ -370,11 +370,7 @@ NewGameDlg::NewGameDlg( QWidget *parent, Game *game)
connect(m_w->randomizeMap, &QPushButton::clicked, this, &NewGameDlg::slotNewMap);
connect(m_w->removePlayerButton, &QPushButton::clicked, this, &NewGameDlg::slotRemovePlayer);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NewGameDlg::slotNewOwner);
#else
connect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &NewGameDlg::slotNewOwner);
#endif
connect(m_w->KillPercentageSB, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, &NewGameDlg::slotNewKillPercentage);
connect(m_w->ProductionSB, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &NewGameDlg::slotNewProduction);
......@@ -503,11 +499,7 @@ NewGameDlg::slotUpdateSelection(const Coordinate &coord)
m_w->KillPercentageSB->setEnabled(hasPlanet);
m_w->ProductionSB->setEnabled(hasPlanet);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
disconnect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NewGameDlg::slotNewOwner);
#else
disconnect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &NewGameDlg::slotNewOwner);
#endif
if (hasPlanet) {
Planet *planet = sector->planet();
......@@ -526,11 +518,7 @@ NewGameDlg::slotUpdateSelection(const Coordinate &coord)
m_w->OwnerCB->setCurrentIndex(0);
}
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NewGameDlg::slotNewOwner);
#else
connect(m_w->OwnerCB, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &NewGameDlg::slotNewOwner);
#endif
}
......
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