summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authorHonglei Zhang <honglei.zhang@nokia.com>2011-08-04 07:47:56 (GMT)
committerHonglei Zhang <honglei.zhang@nokia.com>2011-08-04 07:47:56 (GMT)
commit41c038dadb505d82447e1d9a8a743e0614c60098 (patch)
treec05e11632c8898db7d2e443f6cb09fda75592c14 /src/gui/dialogs
parent8e2dc4ac2ec35e9b2f57ade5af390c2d44765382 (diff)
parent920ce5ed71bc456e429b887801a8d8bea7a3db0d (diff)
downloadQt-41c038dadb505d82447e1d9a8a743e0614c60098.zip
Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.gz
Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qfontdialog.cpp2
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)