aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Martin <[email protected]>2017-03-16 18:30:39 +0100
committerMarco Martin <[email protected]>2017-03-16 18:30:39 +0100
commita25a06b6faeeaeb60f7005a6fbebc2b19774ad35 (patch)
tree86584c91d2ca41330f32cb857cb309b06f845c94
parent5be29cc42f313fbfcef7d270e6991f6e1eb1518e (diff)
remove offending test
in reference to discussion on https://phabricator.kde.org/D4718
-rw-r--r--autotests/test_screen_edges.cpp4
-rw-r--r--kcmkwin/kwincompositing/test/modeltest.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp
index 20bdf8f..0ab9984 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> edge = s->findChildren<Edge*>().last();
- s->reserve(&client, KWin::ElectricBottom);
- QCOMPARE(edge.data(), s->findChildren<Edge*>().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 d356b26..0b270ba 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 ) ) );
}