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/qdial.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/qdial.cpp')
| -rw-r--r-- | src/widgets/widgets/qdial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index 1f06fed0f6..4bdd5538b9 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -231,11 +231,11 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const \table \row \li \inlineimage fusion-dial.png Screenshot of a dial in the Fusion widget style - \li \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP widget style + \li \inlineimage windowsvista-dial.png Screenshot of a dial in the Windows Vista widget style \li \inlineimage macintosh-dial.png Screenshot of a dial in the Macintosh widget style \row \li {3,1} Dials shown in various widget styles (from left to right): \l{Fusion Style Widget Gallery}{Fusion}, - \l{Windows XP Style Widget Gallery}{Windows XP}, + \l{Windows Vista Style Widget Gallery}{Windows Vista}, \l{Macintosh Style Widget Gallery}{Macintosh}. \endtable |