AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "tst_qwidget::activation expect fail on Win 10"

Browse Source 
This reverts commit 8561281768.

This change needs to be reverted because Windows 10 Creator's
Update doesn't fail on this test anymore during CI runs.
Reason for this is unknown.

Change-Id: Ice250ecedb14ac96fb3693b2d9884ef452a91cc2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Joni Jäntti 2017-08-30 15:45:44 +03:00
parent b7722c251c
commit e938150412
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -1774,12 +1774,6 @@ void tst_QWidget::activation()
QCOMPARE(QApplication::activeWindow(), &widget2); QCOMPARE(QApplication::activeWindow(), &widget2);
widget2.hide(); widget2.hide();
QTest::qWait(waitTime); QTest::qWait(waitTime);
#ifdef Q_OS_WIN
if (QSysInfo::kernelVersion() == "10.0.15063") {
QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue);
// This happens in automated Windows 10 Creators Update (10.0.15063) CI builds!
}
#endif
QCOMPARE(QApplication::activeWindow(), &widget1); QCOMPARE(QApplication::activeWindow(), &widget1);
} }
#endif // Q_OS_WIN #endif // Q_OS_WIN