diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
commit | cf00c01f68198f55e0be5de4d9b720a31dea1a21 (patch) | |
tree | 0d119a5be7ef2a258858ded2b264e96d6cd5a572 /examples/widgets | |
parent | ada1b61991b16f21c5cd9c785dc7fbfa832f18be (diff) | |
parent | 3eb42abab6c7d1f3a32ca55c972b1d7a4a703658 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
Diffstat (limited to 'examples/widgets')
-rw-r--r-- | examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp index 2b77dc2fcc..0c3ed86565 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp @@ -66,14 +66,14 @@ EmbeddedDialog::EmbeddedDialog(QWidget *parent) ui->style->setCurrentIndex(ui->style->count() - 1); } - connect(ui->layoutDirection, SIGNAL(activated(int)), - this, SLOT(layoutDirectionChanged(int))); - connect(ui->spacing, SIGNAL(valueChanged(int)), - this, SLOT(spacingChanged(int))); - connect(ui->fontComboBox, SIGNAL(currentFontChanged(QFont)), - this, SLOT(fontChanged(QFont))); - connect(ui->style, SIGNAL(activated(QString)), - this, SLOT(styleChanged(QString))); + connect(ui->layoutDirection, QOverload<int>::of(&QComboBox::activated), + this, &EmbeddedDialog::layoutDirectionChanged); + connect(ui->spacing, &QSlider::valueChanged, + this, &EmbeddedDialog::spacingChanged); + connect(ui->fontComboBox, &QFontComboBox::currentFontChanged, + this, &EmbeddedDialog::fontChanged); + connect(ui->style, QOverload<const QString &>::of(&QComboBox::activated), + this, &EmbeddedDialog::styleChanged); } EmbeddedDialog::~EmbeddedDialog() |