diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-29 15:43:07 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-29 15:43:07 (GMT) |
| commit | 29a5089b83b1b43ecf2c746dac8cadbbe4385553 (patch) | |
| tree | 69a3f39667e0ff22a3d7507fafcdb7c9cd219daf /src/gui/dialogs | |
| parent | c9f0c578bbaf73211ad4729e1496e53867a641c9 (diff) | |
| parent | 174e01a16aba71cfaa7b095be6430f8e4a89d0b8 (diff) | |
| download | Qt-29a5089b83b1b43ecf2c746dac8cadbbe4385553.zip Qt-29a5089b83b1b43ecf2c746dac8cadbbe4385553.tar.gz Qt-29a5089b83b1b43ecf2c746dac8cadbbe4385553.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/text/qfont_s60.cpp
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfontdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index 6a646ff..34b6317 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -160,7 +160,7 @@ QFontDialog::QFontDialog(QWidget *parent) \since 4.5 Constructs a standard font dialog with the given \a parent and specified - \a initial color. + \a initial font. */ QFontDialog::QFontDialog(const QFont &initial, QWidget *parent) : QDialog(*new QFontDialogPrivate, parent, DefaultWindowFlags) |