diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:02:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:02:10 +0100 |
| commit | 60be66f17939ccbc6fcc73a16de45af6822851b8 (patch) | |
| tree | daae9ecc1f7e3a0ebc6b76e6baa27fd37d3e67ff /src/designer/src/designer | |
| parent | 4092c74db6043d70caca36050c356cc5f2d46c86 (diff) | |
| parent | fab885ac1b5e5d3c130c033e4a1234e985179486 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iddb27e0884cb095f46fd668a2b8d64dc6dd4f58d
Diffstat (limited to 'src/designer/src/designer')
| -rw-r--r-- | src/designer/src/designer/qdesigner_appearanceoptions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp index 66eb49c9f..fbcfacc6e 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp +++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp @@ -65,7 +65,7 @@ QDesignerAppearanceOptionsWidget::QDesignerAppearanceOptionsWidget(QWidget *pare m_ui->m_uiModeCombo->addItem(tr("Docked Window"), QVariant(DockedMode)); m_ui->m_uiModeCombo->addItem(tr("Multiple Top-Level Windows"), QVariant(TopLevelMode)); - connect(m_ui->m_uiModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_ui->m_uiModeCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &QDesignerAppearanceOptionsWidget::slotUiModeComboChanged); m_ui->m_fontPanel->setCheckable(true); |