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>

doc/global/qt-cpp-defines.qdocconf

@@ -110,7 +110,6 @@ Cpp.ignoretokens        += \
                           Q_GUI_EXPORT_STYLE_POCKETPC \
                           Q_GUI_EXPORT_STYLE_SGI \
                           Q_GUI_EXPORT_STYLE_WINDOWS \
-                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
                           Q_INLINE_TEMPLATE \
                           Q_INTERNAL_WIN_NO_THROW \
                           Q_INVOKABLE \

src/gui/kernel/qpalette.cpp

@@ -388,7 +388,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
 
     \warning Some styles do not use the palette for all drawing, for
     instance, if they make use of native theme engines. This is the
-    case for both the Windows XP, Windows Vista, and the \macos
+    case for both the Windows Vista and the \macos
     styles.
 
     \sa QApplication::setPalette(), QWidget::setPalette(), QColor

src/plugins/platforms/windows/qwindowstheme.cpp

@@ -415,13 +415,7 @@ static inline QStringList iconThemeSearchPaths()
 
 static inline QStringList styleNames()
 {
-    QStringList result;
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-        result.append(QStringLiteral("WindowsVista"));
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
-        result.append(QStringLiteral("WindowsXP"));
-    result.append(QStringLiteral("Windows"));
-    return result;
+    return { QStringLiteral("WindowsVista"), QStringLiteral("Windows") };
 }
 
 static inline int uiEffects()

src/widgets/configure.json

@@ -10,7 +10,6 @@
         "options": {
             "gtk": { "type": "boolean", "name": "gtk3" },
             "style-windows": "boolean",
-            "style-windowsxp": "boolean",
             "style-windowsvista": "boolean",
             "style-fusion": "boolean",
             "style-mac": "boolean",
@@ -55,14 +54,9 @@
             "label": "Windows",
             "output": [ "privateFeature", "styles" ]
         },
-        "style-windowsxp": {
-            "label": "WindowsXP",
-            "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
-            "output": [ "privateFeature", "styles" ]
-        },
         "style-windowsvista": {
             "label": "WindowsVista",
-            "condition": "features.style-windowsxp",
+            "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
             "output": [ "privateFeature", "styles" ]
         },
         "style-android": {
@@ -699,7 +693,7 @@
                 {
                     "message": "Styles",
                     "type": "featureList",
-                    "args": "style-fusion style-mac style-windows style-windowsxp style-windowsvista style-android"
+                    "args": "style-fusion style-mac style-windows style-windowsvista style-android"
                 }
             ]
         }

src/widgets/doc/src/qtwidgets-index.qdoc

@@ -83,7 +83,7 @@ interfaces
 
     \table
     \row
-    \li \image windowsxp-tabwidget.png
+    \li \image windowsvista-tabwidget.png
     \li \image fusion-tabwidget.png
     \li \image macintosh-tabwidget.png
     \endtable
@@ -118,7 +118,7 @@ interfaces
     which use lists and tables are structured to separate the data and view
     using models, views, and delegates.
 
-    \image windowsxp-treeview.png
+    \image windowsvista-treeview.png
 
     \section1 Graphics View
 

src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc

@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-  \page gallery-windowsxp.html
-
-  \title Windows XP Style Widget Gallery
-  \ingroup gallery
-
-  This page shows some of the widgets available in Qt
-  when configured to use the "windowsxp" style. This
-  style is only available on Windows XP or later. This
-  style provides native look'n'feel by integrating to
-  the Windows platform theme. Thus, the final appearance
-  varies depending on the active Windows theme.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image windowsxp-pushbutton.png
-   \caption The QPushButton widget provides a command button.
-\li \image windowsxp-toolbutton.png
-   \caption The QToolButton class provides a quick-access button to commands
-    or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-checkbox.png
-   \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image windowsxp-radiobutton.png
-   \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image windowsxp-groupbox.png
-   The QGroupBox widget provides a group box frame with a title.
-\li \image windowsxp-tabwidget.png
-   The QTabWidget class provides a stack of tabbed widgets.
-\li \image windowsxp-frame.png
-   The QFrame widget provides a simple decorated container for other widgets.
-\li \image windowsxp-toolbox.png
-   The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image windowsxp-listview.png
-   The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image windowsxp-treeview.png
-   The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image windowsxp-tableview.png
-   The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image windowsxp-progressbar.png
-   The QProgressBar widget provides a horizontal progress bar.
-\li \image windowsxp-label.png
-   The QLabel widget provides a text or image display.
-\li \image windowsxp-lcdnumber.png
-   The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image windowsxp-lineedit.png
-   The QLineEdit widget is a one-line text editor.
-\li \image windowsxp-dateedit.png
-   The QDateEdit class provides a widget for editing dates.
-\li \image windowsxp-timeedit.png
-   The QTimeEdit class provides a widget for editing times.
-\li \image windowsxp-datetimeedit.png
-   The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-slider.png
-   The QSlider widget provides a vertical or horizontal slider.
-\li \image windowsxp-combobox.png
-   The QComboBox widget is a combined button and pop-up list.
-\li \image windowsxp-spinbox.png
-   The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-fontcombobox.png
-   The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image windowsxp-doublespinbox.png
-   The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image windowsxp-horizontalscrollbar.png
-   The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-dial.png
-   The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image windowsxp-textedit.png
-   The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image windowsxp-calendarwidget.png
-   The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/

src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

@@ -36,10 +36,6 @@
 
   \table
   \row
-  \li \image windowsxp-tabwidget.png Windows XP Style Widget Gallery
-  \caption \l{Windows XP Style Widget Gallery}
-
-  The Windows XP style is provided by QWindowsXPStyle.
   \li \image windows-tabwidget.png Windows Style Widget Gallery
   \caption \l{Windows Style Widget Gallery}
 

src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc

@@ -80,7 +80,7 @@
     the QPalette::Button role to red for a QPushButton to obtain a
     red push button. However, this wasn't guaranteed to work for all
     styles, because style authors are restricted by the different
-    platforms' guidelines and (on Windows XP and \macos) by the
+    platforms' guidelines and (on Windows and \macos) by the
     native theme engine.
 
     Style sheets let you perform all kinds of customizations that are
@@ -111,10 +111,8 @@
     will.
 
     \table
-    \row \li \inlineimage stylesheet-coffee-xp.png
-         \li \inlineimage stylesheet-pagefold.png
-    \row \li Coffee theme running on Windows XP
-         \li Pagefold theme running on Windows XP
+    \row \li \inlineimage stylesheet-pagefold.png
+    \row \li Pagefold theme running on Windows
     \endtable
 
     \table
@@ -128,7 +126,7 @@
     is a wrapper "style sheet" style, \e not the platform-specific style. The
     wrapper style ensures that any active style sheet is respected and
     otherwise forwards the drawing operations to the underlying,
-    platform-specific style (e.g., QWindowsXPStyle on Windows XP).
+    platform-specific style (e.g., QWindowsVistaStyle on Windows).
 
     Since Qt 4.5, Qt style sheets fully supports \macos.
 
@@ -3532,7 +3530,7 @@
 
     \list
     \li We have made a request that cannot be satisfied using the
-       native styles alone (e.g., the Windows XP theme engine doesn't
+       native styles alone (e.g., the Windows Vista theme engine doesn't
        let us specify the background color of a button).
     \li Therefore, the button is rendered using style sheets.
     \li We haven't specified any values for

src/widgets/doc/src/widgets-and-layouts/widgets.qdoc

@@ -68,7 +68,7 @@
 
       \table
       \row
-      \li \image windowsxp-treeview.png
+      \li \image windowsvista-treeview.png
       \li \image fusion-calendarwidget.png
       \li \image qundoview.png
       \endtable

src/widgets/kernel/qapplication.cpp

@@ -1227,7 +1227,7 @@ void QApplication::setStyle(QStyle *style)
     Requests a QStyle object for \a style from the QStyleFactory.
 
     The string must be one of the QStyleFactory::keys(), typically one of
-    "windows", "fusion", "windowsxp", or "macintosh". Style
+    "windows", "windowsvista", "fusion", or "macintosh". Style
     names are case insensitive.
 
     Returns 0 if an unknown \a style is passed, otherwise the QStyle object
@@ -1470,8 +1470,8 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
     "selection-background-color" and "alternate-background-color".
 
     \note Some styles do not use the palette for all drawing, for instance, if
-    they make use of native theme engines. This is the case for the Windows XP,
-    Windows Vista, and \macos styles.
+    they make use of native theme engines. This is the case for the
+    Windows Vista and \macos styles.
 
     \sa QWidget::setPalette(), palette(), QStyle::polish()
 */

src/widgets/kernel/qwidget.cpp

@@ -4510,7 +4510,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
     The default depends on the system environment. QApplication maintains a
     system/theme palette which serves as a default for all widgets.  There may
     also be special palette defaults for certain types of widgets (e.g., on
-    Windows XP and Vista, all classes that derive from QMenuBar have a special
+    Windows Vista, all classes that derive from QMenuBar have a special
     default palette). You can also define default palettes for widgets
     yourself by passing a custom palette and the name of a widget to
     QApplication::setPalette(). Finally, the style always has the option of
@@ -4528,8 +4528,8 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
     The current style, which is used to render the content of all standard Qt
     widgets, is free to choose colors and brushes from the widget palette, or
     in some cases, to ignore the palette (partially, or completely). In
-    particular, certain styles like GTK style, Mac style, Windows XP, and
-    Vista style, depend on third party APIs to render the content of widgets,
+    particular, certain styles like GTK style, Mac style, and Windows Vista
+    style, depend on third party APIs to render the content of widgets,
     and these styles typically do not follow the palette. Because of this,
     assigning roles to a widget's palette is not guaranteed to change the
     appearance of the widget. Instead, you may choose to apply a \l
@@ -4691,7 +4691,7 @@ void QWidgetPrivate::updateSystemBackground()
     The current style, which is used to render the content of all standard Qt
     widgets, is free to choose to use the widget font, or in some cases, to
     ignore it (partially, or completely). In particular, certain styles like
-    GTK style, Mac style, Windows XP, and Vista style, apply special
+    GTK style, Mac style, and Windows Vista style, apply special
     modifications to the widget font to match the platform's native look and
     feel. Because of this, assigning properties to a widget's font is not
     guaranteed to change the appearance of the widget. Instead, you may choose

src/widgets/styles/qmacstyle.qdoc

@@ -82,7 +82,7 @@
     documentation.
 
     \image qmacstyle.png
-    \sa QWindowsXPStyle, QWindowsStyle, QFusionStyle
+    \sa QWindowsVistaStyle, QWindowsStyle, QFusionStyle
 */
 
 

src/widgets/styles/qstyle.cpp

@@ -2291,8 +2291,8 @@ int QStyle::sliderValueFromPosition(int min, int max, int pos, int span, bool up
      Returns the style's standard palette.
 
     Note that on systems that support system colors, the style's
-    standard palette is not used. In particular, the Windows XP,
-    Vista, and Mac styles do not use the standard palette, but make
+    standard palette is not used. In particular, the Windows
+    Vista and Mac styles do not use the standard palette, but make
     use of native theme engines. With these styles, you should not set
     the palette with QApplication::setPalette().
 

src/widgets/styles/qstylefactory.cpp

@@ -50,9 +50,6 @@
 #include "qandroidstyle_p.h"
 #endif
 #endif
-#if QT_CONFIG(style_windowsxp)
-#include "qwindowsxpstyle_p.h"
-#endif
 #if QT_CONFIG(style_windowsvista)
 #include "qwindowsvistastyle_p.h"
 #endif
@@ -81,7 +78,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 
     The valid keys can be retrieved using the keys()
     function. Typically they include "windows" and "fusion".
-    Depending on the platform, "windowsxp", "windowsvista"
+    Depending on the platform, "windowsvista"
     and "macintosh" may be available.
     Note that keys are case insensitive.
 
@@ -108,11 +105,6 @@ QStyle *QStyleFactory::create(const QString& key)
         ret = new QWindowsStyle;
     else
 #endif
-#if QT_CONFIG(style_windowsxp)
-    if (style == QLatin1String("windowsxp"))
-        ret = new QWindowsXPStyle;
-    else
-#endif
 #if QT_CONFIG(style_windowsvista)
     if (style == QLatin1String("windowsvista"))
         ret = new QWindowsVistaStyle;
@@ -164,11 +156,6 @@ QStringList QStyleFactory::keys()
     if (!list.contains(QLatin1String("Windows")))
         list << QLatin1String("Windows");
 #endif
-#if QT_CONFIG(style_windowsxp)
-    if (!list.contains(QLatin1String("WindowsXP")) &&
-        (QSysInfo::WindowsVersion >= QSysInfo::WV_XP && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
-        list << QLatin1String("WindowsXP");
-#endif
 #if QT_CONFIG(style_windowsvista)
     if (!list.contains(QLatin1String("WindowsVista")) &&
         (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))

src/widgets/styles/qstylesheetstyle_default.cpp

@@ -78,7 +78,7 @@ using namespace QCss;
     bSelector.pseudos << pseudo
 
 // This is attributes. The third parameter is AttributeSelector::*
-// Ex. QComboBox[style="QWindowsXPStyle"]
+// Ex. QComboBox[style="QWindowsVistaStyle"]
 //                 ^           ^
 
 #define ADD_ATTRIBUTE_SELECTOR(x, y, z) \
@@ -155,7 +155,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
 
     // pixmap based style doesn't support any features
     bool styleIsPixmapBased = baseStyle()->inherits("QMacStyle")
-                           || baseStyle()->inherits("QWindowsXPStyle");
+                           || baseStyle()->inherits("QWindowsVistaStyle");
 
 
     /*QLineEdit {

src/widgets/styles/qwindowsxpstyle.cpp

@@ -39,7 +39,7 @@
 #include "qwindowsxpstyle_p.h"
 #include "qwindowsxpstyle_p_p.h"
 
-#if QT_CONFIG(style_windowsxp) || defined(QT_PLUGIN)
+#if QT_CONFIG(style_windowsvista) || defined(QT_PLUGIN)
 
 #include <private/qobject_p.h>
 #include <private/qpaintengine_raster_p.h>

src/widgets/styles/qwindowsxpstyle_p.h

@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 
-#if QT_CONFIG(style_windowsxp)
+#if QT_CONFIG(style_windowsvista)
 
 class QWindowsXPStylePrivate;
 class QWindowsXPStyle : public QWindowsStyle
@@ -102,7 +102,7 @@ private:
     friend class QStyleFactory;
 };
 
-#endif // style_windowsxp
+#endif // style_windowsvista
 
 QT_END_NAMESPACE
 

src/widgets/styles/qwindowsxpstyle_p_p.h

@@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE
 // Uncomment define below to build debug assisting code, and output
 // #define DEBUG_XP_STYLE
 
-#if QT_CONFIG(style_windowsxp)
+#if QT_CONFIG(style_windowsvista)
 
 // Declarations -----------------------------------------------------------------------------------
 class XPThemeData

src/widgets/styles/styles.pri

@@ -48,9 +48,7 @@ qtConfig(style-mac) {
 qtConfig(style-windowsvista) {
     HEADERS += styles/qwindowsvistastyle_p.h styles/qwindowsvistastyle_p_p.h
     SOURCES += styles/qwindowsvistastyle.cpp
-}
 
-qtConfig(style-windowsxp) {
     HEADERS += styles/qwindowsxpstyle_p.h styles/qwindowsxpstyle_p_p.h
     SOURCES += styles/qwindowsxpstyle.cpp
 }

src/widgets/util/qsystemtrayicon.cpp

@@ -350,7 +350,7 @@ bool QSystemTrayIcon::event(QEvent *e)
 
     Currently this signal is not sent on \macos.
 
-    \note We follow Microsoft Windows XP/Vista behavior, so the
+    \note We follow Microsoft Windows behavior, so the
     signal is also emitted when the user clicks on a tray icon with
     a balloon message displayed.
 

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);

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

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
 */

tests/auto/widgets/styles/qstyle/tst_qstyle.cpp

@@ -86,9 +86,6 @@ private slots:
     void testFusionStyle();
 #endif
     void testWindowsStyle();
-#if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP)
-    void testWindowsXPStyle();
-#endif
 #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA)
     void testWindowsVistaStyle();
 #endif
@@ -147,12 +144,7 @@ void tst_QStyle::testStyleFactory()
     QVERIFY(keys.contains("Windows"));
 #endif
 #ifdef Q_OS_WIN
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP &&
-        (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
-        QVERIFY(keys.contains("WindowsXP"));
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA &&
-        (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
-        QVERIFY(keys.contains("WindowsVista"));
+    QVERIFY(keys.contains("WindowsVista"));
 #endif
 
     foreach (QString styleName , keys) {
@@ -340,17 +332,6 @@ void tst_QStyle::testWindowsStyle()
     delete wstyle;
 }
 
-#if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP)
-// WindowsXP style
-void tst_QStyle::testWindowsXPStyle()
-{
-    QStyle *xpstyle = QStyleFactory::create("WindowsXP");
-    QVERIFY(testAllFunctions(xpstyle));
-    lineUpLayoutTest(xpstyle);
-    delete xpstyle;
-}
-#endif
-
 void writeImage(const QString &fileName, QImage image)
 {
     QImageWriter imageWriter(fileName);
@@ -373,8 +354,6 @@ void tst_QStyle::testWindowsVistaStyle()
 
     if (QSysInfo::WindowsVersion == QSysInfo::WV_VISTA)
         testPainting(vistastyle, "vista");
-    else if (QSysInfo::WindowsVersion == QSysInfo::WV_XP)
-        testPainting(vistastyle, "xp");
     delete vistastyle;
 }
 #endif

tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp

@@ -520,9 +520,6 @@ void tst_QPushButton::sizeHint_data()
 #if !defined(QT_NO_STYLE_FUSION)
     QTest::newRow("fusion") << QString::fromLatin1("fusion");
 #endif
-#if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP)
-    QTest::newRow("windowsxp") << QString::fromLatin1("windowsxp");
-#endif
 #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA)
     QTest::newRow("windowsvista") << QString::fromLatin1("windowsvista");
 #endif