From bb5e45d0a06f7d0e6c71e04166894b41e2df665b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 16 Nov 2012 17:22:40 +0100 Subject: Made QWindowsXPStyle internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'tests/auto/widgets/styles/qstyle/tst_qstyle.cpp') 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 #endif -#ifdef Q_OS_WIN -#include -#endif - #ifdef Q_OS_WINCE #include #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 -- cgit v1.2.3