aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-14 09:09:54 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-10-15 08:38:44 +0000
commitccbed88825cef76545e1e3a47c92fb237e4beeb9 (patch)
treea86751e873f951ab86c86ae3b8c34dc8598f1cc3 /tests
parentbc436dfec3c8cf10dbbb2ff51fd9ab003620b5dd (diff)
QWinJumpList: Skip failing tests on Windows 10.
Task-number: QTBUG-48751 Change-Id: If1a16a251d165447b3d9dba3a15d0c58d7ca0969 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qwinjumplist/tst_qwinjumplist.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
index 1944646..df7a366 100644
--- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
+++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
@@ -60,6 +60,8 @@ static inline QByteArray msgFileNameMismatch(const QString &f1, const QString &f
void tst_QWinJumpList::testRecent()
{
+ if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10)
+ QSKIP("QTBUG-48751: Recent items do not work on Windows 10", Continue);
QScopedPointer<QWinJumpList> jumplist(new QWinJumpList);
QWinJumpListCategory *recent1 = jumplist->recent();
QVERIFY(recent1);
@@ -107,6 +109,8 @@ void tst_QWinJumpList::testRecent()
void tst_QWinJumpList::testFrequent()
{
+ if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10)
+ QSKIP("QTBUG-48751: Frequent items do not work on Windows 10", Continue);
QScopedPointer<QWinJumpList> jumplist(new QWinJumpList);
QWinJumpListCategory *frequent1 = jumplist->frequent();
QVERIFY(frequent1);