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/qdatetimeedit.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/qdatetimeedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 394e2b537f..a962762bb1 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -105,8 +105,8 @@ QT_BEGIN_NAMESPACE calendar widget can be retrieved with calendarWidget(). \table 100% - \row \li \inlineimage windowsxp-datetimeedit.png Screenshot of a Windows XP style date time editing widget - \li A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage windowsvista-datetimeedit.png Screenshot of a Windows Vista style date time editing widget + \li A date time editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. \row \li \inlineimage macintosh-datetimeedit.png Screenshot of a Macintosh style date time editing widget \li A date time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage fusion-datetimeedit.png Screenshot of a Fusion style date time editing widget @@ -1536,8 +1536,8 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) \endlist \table 100% - \row \li \inlineimage windowsxp-timeedit.png Screenshot of a Windows XP style time editing widget - \li A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage windowsvista-timeedit.png Screenshot of a Windows Vista style time editing widget + \li A time editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. \row \li \inlineimage macintosh-timeedit.png Screenshot of a Macintosh style time editing widget \li A time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage fusion-timeedit.png Screenshot of a Fusion style time editing widget @@ -1613,8 +1613,8 @@ QTimeEdit::~QTimeEdit() \endlist \table 100% - \row \li \inlineimage windowsxp-dateedit.png Screenshot of a Windows XP style date editing widget - \li A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage windowsvista-dateedit.png Screenshot of a Windows Vista style date editing widget + \li A date editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. \row \li \inlineimage macintosh-dateedit.png Screenshot of a Macintosh style date editing widget \li A date editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage fusion-dateedit.png Screenshot of a Fusion style date editing widget |