diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qwinjumplist/tst_qwinjumplist.cpp | 5 | ||||
| -rw-r--r-- | tests/manual/jumplist/testwidget.h | 2 |
2 files changed, 4 insertions, 3 deletions
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 <QWinJumpList> #include <QWinJumpListItem> #include <QWinJumpListCategory> +#include <QOperatingSystemVersion> 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<QWinJumpList> 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<QWinJumpList> jumplist(new QWinJumpList); QWinJumpListCategory *frequent1 = jumplist->frequent(); diff --git a/tests/manual/jumplist/testwidget.h b/tests/manual/jumplist/testwidget.h index 61ca4c6..0cae1ea 100644 --- a/tests/manual/jumplist/testwidget.h +++ b/tests/manual/jumplist/testwidget.h @@ -46,7 +46,7 @@ class TestWidget : public QMainWindow Q_OBJECT public: - explicit TestWidget(QWidget *parent = Q_NULLPTR); + explicit TestWidget(QWidget *parent = nullptr); ~TestWidget(); void showFile(const QString &path); |