3eac474 · unity8 · git.iko.soy

on xenial help sign in

merge prereq

3eac474Lukáš Tinkl10 years ago

tests/qmltests/Panel/tst_Panel.qml−2

@@ -380,8 +380,6 @@ IndicatorTest {

380 tap(panel, stepLength * i, tapY);

381 tryCompare(panel.indicators, "fullyClosed", true);

382 }

383−

384− compare(backgroundPressedSpy.count, 0);

385 }

383 }

386

384

387 function test_darkenedAreaEatsAllEvents() {

385 function test_darkenedAreaEatsAllEvents() {

tests/qmltests/tst_Shell.qml+2−3

@@ -2664,9 +2664,8 @@ Rectangle {

2664 appDelegate.maximize();

2665 tryCompare(appDelegate, "state", "maximized");

2666

2667− mouseDrag(panel, panel.width/2, panel.height/2, 0, shell.height/3, Qt.LeftButton);

2667+ mouseDrag(panel, panel.width/2, panel.height/2, 0, shell.height/3, Qt.LeftButton, Qt.NoModifier, 100);

2668− mouseRelease(appDelegate.findChild("appWindowDecoration"));

2669− tryCompare(appDelegate, "state", "restored");

2668+ tryCompare(appDelegate, "state", "normal");

2670 }

2669 }

2671

2670

2672 function test_fullShellModeHasNoInitialGreeter() {

2671 function test_fullShellModeHasNoInitialGreeter() {