diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-16 17:22:40 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 16:36:50 +0100 |
commit | bb5e45d0a06f7d0e6c71e04166894b41e2df665b (patch) | |
tree | d327caed94b9cf6c79888507e881cb544cc4691b /tests/auto/widgets | |
parent | 537efea52b43c9b8f4fdb12121ac6d0263be21fe (diff) |
Made QWindowsXPStyle internal
We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy and even merging style
implementations (XP & Vista) later on, without worrying about BC.
=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsXPStyle directly.
Change-Id: Ib4fec35c2fcb3b5a193537a1de5b6e26fbbe0a06
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 73dec7d566..d4d26cc9cf 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -75,10 +75,6 @@ #include <QMacStyle> #endif -#ifdef Q_OS_WIN -#include <QWindowsXPStyle> -#endif - #ifdef Q_OS_WINCE #include <QWindowsCEStyle> #endif @@ -392,9 +388,10 @@ void tst_QStyle::testWindowsStyle() // WindowsXP style void tst_QStyle::testWindowsXPStyle() { - QWindowsXPStyle xpstyle; - QVERIFY(testAllFunctions(&xpstyle)); - lineUpLayoutTest(&xpstyle); + QStyle *xpstyle = QStyleFactory::create("WindowsXP"); + QVERIFY(testAllFunctions(xpstyle)); + lineUpLayoutTest(xpstyle); + delete xpstyle; } #endif |