diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-17 06:59:50 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-17 06:59:50 (GMT) |
| commit | fa58c0e9afecc3807bd76babbd5da3918afcdd3d (patch) | |
| tree | 4895431d492b093b1e2ee29032fa82999a8ed09b /tests/auto/qstyle/tst_qstyle.cpp | |
| parent | 04c01e15739d926ef653293ef1e89132085d7acd (diff) | |
| parent | 8eb08c8c294f00763961e86cc3370b0ef78c8976 (diff) | |
| download | Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.zip Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.gz Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tests/auto/qstyle/tst_qstyle.cpp')
| -rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index e31e0db..cb30f83 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -70,10 +70,7 @@ #include <qlineedit.h> #include <qmdiarea.h> - -#if QT_VERSION >= 0x040200 #include <QCleanlooksStyle> -#endif #ifdef Q_WS_MAC #include <QMacStyle> @@ -343,7 +340,7 @@ void tst_QStyle::testPlastiqueStyle() void tst_QStyle::testCleanlooksStyle() { -#if QT_VERSION >= 0x040200 && !defined(QT_NO_STYLE_CLEANLOOKS) +#if !defined(QT_NO_STYLE_CLEANLOOKS) QCleanlooksStyle cstyle; testAllFunctions(&cstyle); lineUpLayoutTest(&cstyle); @@ -365,7 +362,7 @@ void tst_QStyle::testWindowsXPStyle() QWindowsXPStyle xpstyle; testAllFunctions(&xpstyle); lineUpLayoutTest(&xpstyle); -#else +#else QSKIP("No WindowsXP style", SkipAll); #endif } |