From 98d263a673921b70d13f5aec336b371a0eec574e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 28 Sep 2017 14:20:44 +0200 Subject: Clean up code checking the Windows version Use QOperatingSystemVersion or remove code for version < Windows 7. Change-Id: I080778255f1427d79bceb77a2fa39728c538ec40 Reviewed-by: Andre de la Rocha Reviewed-by: Jake Petroules --- examples/winextras/iconextractor/main.cpp | 2 +- tests/auto/qwinjumplist/tst_qwinjumplist.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp index 6efd27b..5e6dbd3 100644 --- a/examples/winextras/iconextractor/main.cpp +++ b/examples/winextras/iconextractor/main.cpp @@ -237,7 +237,7 @@ static PixmapEntryList extractShellIcons(const QString &sourceFile, bool addOver } } // for standardSizeEntryCount // Windows Vista onwards: extract large/jumbo icons - if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA && info.hIcon) { + if (info.hIcon) { const QPixmap extraLarge = pixmapFromShellImageList(sHIL_EXTRALARGE, info); if (!extraLarge.isNull()) { PixmapEntry entry; diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp index 26f382e..40d6b04 100644 --- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp +++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp @@ -30,6 +30,7 @@ #include #include #include +#include Q_DECLARE_METATYPE(QWinJumpListItem::Type) @@ -55,7 +56,7 @@ static inline QByteArray msgFileNameMismatch(const QString &f1, const QString &f void tst_QWinJumpList::testRecent() { - if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8_1) + if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8_1) QSKIP("QTBUG-48751: Recent items do not work on Windows 8.1 or 10", Continue); QScopedPointer jumplist(new QWinJumpList); QWinJumpListCategory *recent1 = jumplist->recent(); @@ -104,7 +105,7 @@ void tst_QWinJumpList::testRecent() void tst_QWinJumpList::testFrequent() { - if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8_1) + if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8_1) QSKIP("QTBUG-48751: Frequent items do not work on Windows 8.1 or 10", Continue); QScopedPointer jumplist(new QWinJumpList); QWinJumpListCategory *frequent1 = jumplist->frequent(); -- cgit v1.2.3