diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/richtext/textedit | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/richtext/textedit')
-rw-r--r-- | examples/widgets/richtext/textedit/images/mac/exportpdf.png | bin | 1215 -> 12637 bytes | |||
-rw-r--r-- | examples/widgets/richtext/textedit/images/mac/filesave.png | bin | 1206 -> 2699 bytes | |||
-rw-r--r-- | examples/widgets/richtext/textedit/images/win/exportpdf.png | bin | 1059 -> 1215 bytes | |||
-rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 6 |
4 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/richtext/textedit/images/mac/exportpdf.png b/examples/widgets/richtext/textedit/images/mac/exportpdf.png Binary files differindex ebb44e6b88..9e199407af 100644 --- a/examples/widgets/richtext/textedit/images/mac/exportpdf.png +++ b/examples/widgets/richtext/textedit/images/mac/exportpdf.png diff --git a/examples/widgets/richtext/textedit/images/mac/filesave.png b/examples/widgets/richtext/textedit/images/mac/filesave.png Binary files differindex b41ecf5319..e65a29d5f1 100644 --- a/examples/widgets/richtext/textedit/images/mac/filesave.png +++ b/examples/widgets/richtext/textedit/images/mac/filesave.png diff --git a/examples/widgets/richtext/textedit/images/win/exportpdf.png b/examples/widgets/richtext/textedit/images/win/exportpdf.png Binary files differindex eef5132928..ebb44e6b88 100644 --- a/examples/widgets/richtext/textedit/images/win/exportpdf.png +++ b/examples/widgets/richtext/textedit/images/win/exportpdf.png diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 0d51ce61ad..3ad9f48b67 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -369,7 +369,7 @@ void TextEdit::setupTextActions() comboFont = new QFontComboBox(tb); tb->addWidget(comboFont); - connect(comboFont, QOverload<const QString &>::of(&QComboBox::activated), this, &TextEdit::textFamily); + connect(comboFont, &QComboBox::textActivated, this, &TextEdit::textFamily); comboSize = new QComboBox(tb); comboSize->setObjectName("comboSize"); @@ -377,11 +377,11 @@ void TextEdit::setupTextActions() comboSize->setEditable(true); const QList<int> standardSizes = QFontDatabase::standardSizes(); - foreach (int size, standardSizes) + for (int size : standardSizes) comboSize->addItem(QString::number(size)); comboSize->setCurrentIndex(standardSizes.indexOf(QApplication::font().pointSize())); - connect(comboSize, QOverload<const QString &>::of(&QComboBox::activated), this, &TextEdit::textSize); + connect(comboSize, &QComboBox::textActivated, this, &TextEdit::textSize); } bool TextEdit::load(const QString &f) |