diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-27 12:12:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-27 12:12:04 (GMT) |
| commit | 15d36189d0dcc5c97deadcf83bc072873726d449 (patch) | |
| tree | 4adbf3c994570d123922521ed5df85238289065e /src/gui/dialogs | |
| parent | d380d36a84a2b5814e7b06d28a5cc68866e9fd2b (diff) | |
| parent | cc500b182e26d53ca16136f24a06a111f4374425 (diff) | |
| download | Qt-15d36189d0dcc5c97deadcf83bc072873726d449.zip Qt-15d36189d0dcc5c97deadcf83bc072873726d449.tar.gz Qt-15d36189d0dcc5c97deadcf83bc072873726d449.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Save previous font engine for right bearing adjustment
Fix compilation under OSX 10.7 or using llvm-gcc.
Fix typo in QFontDialog docs
Reset previousGlyph once we reached a new text item
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) |