yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[autotest] Remove workaround in ScreenEdgeTest with Qt 5.6.1

Browse source 
With eda4f61037 we introduced a workaround
for a problem introduced in Qt 5.5.1. This seems to be fixed in Qt 5.6.1.
This commit is contained in:
Martin Gräßlin 2016-04-26 15:51:16 +02:00
parent 2273fc0559
commit 046d06716c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autotests/test_screen_edges.cpp
View file

@ -301,9 +301,11 @@ void TestScreenEdges::testCreatingInitialEdges()
s->updateLayout();
auto edgeWindows = s->windows();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
#if (QT_VERSION < QT_VERSION_CHECK(5, 6, 1))
if (!Xcb::Extensions::self()->isRandrAvailable()) {
QEXPECT_FAIL("", "Broken on no xrandr systems in Qt 5.5", Abort);
}
#endif
#endif
QCOMPARE(edgeWindows.size(), 12);
@ -424,9 +426,11 @@ void TestScreenEdges::testCallback()
return e->isScreenEdge() && e->isLeft() && e->approachGeometry().bottom() < 768;
});
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
#if (QT_VERSION < QT_VERSION_CHECK(5, 6, 1))
if (!Xcb::Extensions::self()->isRandrAvailable()) {
QEXPECT_FAIL("", "Broken on no xrandr systems in Qt 5.5", Abort);
}
#endif
#endif
QVERIFY(it != edges.constEnd());