summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2011-10-06 10:42:17 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2011-10-06 10:42:17 (GMT)
commit1ef309e964753105e14a8c223a1b59c0cbd9369b (patch)
treed5167c327bbb4c05b4a5e9023f4e4caf60e663ea /tests
parentd1fa89e1cce4dcc6bf15fc59196be6764fda51d1 (diff)
downloadQt-1ef309e964753105e14a8c223a1b59c0cbd9369b.zip
Qt-1ef309e964753105e14a8c223a1b59c0cbd9369b.tar.gz
Qt-1ef309e964753105e14a8c223a1b59c0cbd9369b.tar.bz2
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
Merge-request: 1272 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qstyle/tst_qstyle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index 79c3ba8..a6c7a86 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -213,10 +213,10 @@ void tst_QStyle::testStyleFactory()
#endif
#ifdef Q_WS_WIN
if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP &&
- QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+ (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
QVERIFY(keys.contains("WindowsXP"));
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA &&
- QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+ (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
QVERIFY(keys.contains("WindowsVista"));
#endif