diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-04-10 10:32:14 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-04-13 21:39:09 +0000 |
commit | 401d9b527823ffc8691e8a624ee3d40495622359 (patch) | |
tree | ae10e7d53bc810f9a3402cd9f34f480d0d0d3e67 /src/widgets/widgets | |
parent | 4b0d6704d9e44b19c14958c031186ea17370755d (diff) |
Remove the Windows XP style from public accessibility
Later, the Windows XP style will be removed entirely by means of
being merged with the Windows Vista style (which inherits from the
XP style).
There was actually no reason for these styles being separate
classes in the first place, because both result in the same
appearance for controls on the running version of Windows.
Therefore, the windowsxp style merely appears as a "broken"
version of the windowsvista style, with only minor differences
based on the additional metrics that the vista style provides.
The windowsxp style does NOT, and never did, allow users to get
a Windows XP style appearance on Windows 7 and above (which is
currently Qt's minimum supported platform). Therefore, now that
Qt no longer supports Windows XP, the windowsxp style is unusable.
[ChangeLog][QtWidgets] The windowsxp style is no longer available
as a separate style, because it did not (and cannot) actually
provide an XP-style appearance on currently supported Qt platforms.
Change-Id: I513d9bce3f247f97cfb28dfee88fe888469e0a6f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmenu.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qprogressbar.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index d25f4d922e..59a1e99398 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1438,7 +1438,7 @@ void QDockWidget::paintEvent(QPaintEvent *event) } // Title must be painted after the frame, since the areas overlap, and - // the title may wish to extend out to all sides (eg. XP style) + // the title may wish to extend out to all sides (eg. Vista style) QStyleOptionDockWidget titleOpt; initStyleOption(&titleOpt); p.drawControl(QStyle::CE_DockWidgetTitle, titleOpt); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 88d1e16bd8..bdeb46e88a 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1472,11 +1472,9 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) \table 100% \row \li \inlineimage fusion-menu.png - \li \inlineimage windowsxp-menu.png \li \inlineimage macintosh-menu.png \endtable - \caption Fig. A menu shown in \l{Fusion Style Widget Gallery}{Fusion widget style}, - \l{Windows XP Style Widget Gallery}{Windows XP widget style}, + \caption Fig. A menu shown in \l{Fusion Style Widget Gallery}{Fusion widget style} and \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \section1 Actions diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 2b228cdb2c..39faf2e458 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -220,7 +220,7 @@ bool QProgressBarPrivate::repaintRequired() const Note that whether or not the text is drawn is dependent on the style. Currently CleanLooks and Plastique draw the text. Mac, Windows - and WindowsXP style do not. + and WindowsVista style do not. \sa textDirection */ |