From a25a06b6faeeaeb60f7005a6fbebc2b19774ad35 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 16 Mar 2017 18:30:39 +0100 Subject: [PATCH] remove offending test in reference to discussion on https://phabricator.kde.org/D4718 --- autotests/test_screen_edges.cpp | 4 ---- kcmkwin/kwincompositing/test/modeltest.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp index 20bdf8fc88..0ab99844f7 100644 --- a/autotests/test_screen_edges.cpp +++ b/autotests/test_screen_edges.cpp @@ -732,12 +732,8 @@ void TestScreenEdges::testClientEdge() s->reserve(&client, KWin::ElectricBottom); - // let's set the client to be hidden - client.setHiddenInternal(true); QPointer edge = s->findChildren().last(); - s->reserve(&client, KWin::ElectricBottom); - QCOMPARE(edge.data(), s->findChildren().last()); QCOMPARE(edge->isReserved(), true); //remove old reserves and resize to be in the middle of the screen diff --git a/kcmkwin/kwincompositing/test/modeltest.cpp b/kcmkwin/kwincompositing/test/modeltest.cpp index d356b26c54..0b270ba189 100644 --- a/kcmkwin/kwincompositing/test/modeltest.cpp +++ b/kcmkwin/kwincompositing/test/modeltest.cpp @@ -453,7 +453,7 @@ void ModelTest::data() // Check that the alignment is one we know about QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); if ( textAlignmentVariant.isValid() ) { - int alignment = textAlignmentVariant.toInt(); + unsigned int alignment = textAlignmentVariant.toInt(); QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); }