summaryrefslogtreecommitdiffstats
path: root/examples/widgets/widgets/charactermap
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-07-28 13:20:41 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2016-08-01 18:20:00 +0200
commitf6fc34294f5691da8aa7ab8dc0452c6fa9036b67 (patch)
tree3b8fe9841f88aa81e2f8f2d57cbbca2c4736ca6f /examples/widgets/widgets/charactermap
parent6f75096afc000991111bb0fd7a7e530ce3518627 (diff)
parent0eb77c3011ee4d6bbc46dd2d40c9324e9bfcbecf (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
Diffstat (limited to 'examples/widgets/widgets/charactermap')
-rw-r--r--examples/widgets/widgets/charactermap/mainwindow.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 160b77a945..2141850f16 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -167,25 +167,27 @@ void MainWindow::findSizes(const QFont &font)
{
QFontDatabase fontDatabase;
QString currentSize = sizeCombo->currentText();
- sizeCombo->blockSignals(true);
- sizeCombo->clear();
-
- int size;
- if(fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
- foreach(size, QFontDatabase::standardSizes()) {
- sizeCombo->addItem(QVariant(size).toString());
- sizeCombo->setEditable(true);
- }
- } else {
- foreach(size, fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font))) {
- sizeCombo->addItem(QVariant(size).toString());
- sizeCombo->setEditable(false);
+ {
+ const QSignalBlocker blocker(sizeCombo);
+ // sizeCombo signals are now blocked until end of scope
+ sizeCombo->clear();
+
+ int size;
+ if (fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
+ foreach (size, QFontDatabase::standardSizes()) {
+ sizeCombo->addItem(QVariant(size).toString());
+ sizeCombo->setEditable(true);
+ }
+
+ } else {
+ foreach (size, fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font))) {
+ sizeCombo->addItem(QVariant(size).toString());
+ sizeCombo->setEditable(false);
+ }
}
}
- sizeCombo->blockSignals(false);
-
int sizeIndex = sizeCombo->findText(currentSize);
if(sizeIndex == -1)