diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/widgets/widgets/qfontcombobox.cpp | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/widgets/widgets/qfontcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index ab878cc98f..f602a47051 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -314,7 +314,7 @@ void QFontComboBoxPrivate::_q_currentChanged(const QString &text) filter out certain types of fonts as e.g. non scalable fonts or monospaced fonts. - \image windowsxp-fontcombobox.png Screenshot of QFontComboBox on Windows XP + \image windowsvista-fontcombobox.png Screenshot of QFontComboBox on Windows Vista \sa QComboBox, QFont, QFontInfo, QFontMetrics, QFontDatabase, {Character Map Example} */ |