diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
| commit | 569dfab376d9f63422791566d1888618934ffdc3 (patch) | |
| tree | 7098d0e33f0cdb19b144f33318210bf801575c42 /src/gui/widgets/qfontcombobox.cpp | |
| parent | e68fa8d463ff10f7eb2b486362ef73eea9271ff8 (diff) | |
| parent | bd23da275dc88951e17137ef02147c9b5499bce7 (diff) | |
| download | Qt-569dfab376d9f63422791566d1888618934ffdc3.zip Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.gz Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qfontcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qfontcombobox.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp index d601f81..b976b94 100644 --- a/src/gui/widgets/qfontcombobox.cpp +++ b/src/gui/widgets/qfontcombobox.cpp @@ -269,9 +269,8 @@ void QFontComboBoxPrivate::_q_updateModel() void QFontComboBoxPrivate::_q_currentChanged(const QString &text) { Q_Q(QFontComboBox); - QFont newFont(text); - if (currentFont.family() != newFont.family()) { - currentFont = newFont; + if (currentFont.family() != text) { + currentFont.setFamily(text); emit q->currentFontChanged(currentFont); } } |