summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-13 12:41:32 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-13 14:07:53 +0100
commitd664b8f6b8689216b844d4716ee06c2cde7b9c2b (patch)
tree5283f6e44e90cd24ae5eefee6f608acab695d8c4 /src/shared
parenta71c95eda2e941f97286b75f10634c3516e6eb68 (diff)
Fix deprecation warnings about QComboBox: deprecate currentIndexChanged(QString)
Fix warnings introduced qtbase/11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343. Task-number: QTBUG-81845 Change-Id: I49169c34ec9aaff3625bcb9dfaef1d29b7beae07 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/fontpanel/fontpanel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp
index 2645d992e..325dad205 100644
--- a/src/shared/fontpanel/fontpanel.cpp
+++ b/src/shared/fontpanel/fontpanel.cpp
@@ -68,7 +68,7 @@ FontPanel::FontPanel(QWidget *parentWidget) :
writingSystems.push_front(QFontDatabase::Any);
for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems))
m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws));
- connect(m_writingSystemComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+ connect(m_writingSystemComboBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
this, &FontPanel::slotWritingSystemChanged);
formLayout->addRow(tr("&Writing system"), m_writingSystemComboBox);
@@ -77,12 +77,12 @@ FontPanel::FontPanel(QWidget *parentWidget) :
formLayout->addRow(tr("&Family"), m_familyComboBox);
m_styleComboBox->setEditable(false);
- connect(m_styleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+ connect(m_styleComboBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
this, &FontPanel::slotStyleChanged);
formLayout->addRow(tr("&Style"), m_styleComboBox);
m_pointSizeComboBox->setEditable(false);
- connect(m_pointSizeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+ connect(m_pointSizeComboBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
this, &FontPanel::slotPointSizeChanged);
formLayout->addRow(tr("&Point size"), m_pointSizeComboBox);