diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
| commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
| tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /src/widgets/widgets/qfontcombobox.cpp | |
| parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
| parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'src/widgets/widgets/qfontcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 0b0efa2bdf..2bbf3730db 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -346,9 +346,10 @@ void QFontComboBoxPrivate::_q_updateModel() //this prevents the current index from changing //it will be updated just after this ///TODO: we should finda way to avoid blocking signals and have a real update of the model - const bool old = m->blockSignals(true); - m->setStringList(list); - m->blockSignals(old); + { + const QSignalBlocker blocker(m); + m->setStringList(list); + } if (list.isEmpty()) { if (currentFont != QFont()) { |