7de3ac1 · unity8 · git.iko.soy

plugins/Cursor/MousePointer.cpp+1−1

compare with xenial

unifiedsplit

@@ -34,7 +34,7 @@ MousePointer::MousePointer(QQuickItem *parent)

34{

35}

36

37−void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,

37+void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

38 Qt::KeyboardModifiers modifiers)

39{

40 if (!parentItem()) {

plugins/Cursor/MousePointer.h+1−1

@@ -39,7 +39,7 @@ public:

39 qreal hotspotY() const override { return m_hotspotY; }

40

41public Q_SLOTS:

42− void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,

42+ void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

43 Qt::KeyboardModifiers modifiers) override;

44

45protected:

tests/qmltests/Stages/tst_WindowResizeArea.qml−19

@@ -147,25 +147,6 @@ Item {

147 compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));

148 }

149

150− function test_saveRestorePosition() {

151− var initialWindowX = fakeWindow.x;

152− var initialWindowY = fakeWindow.y;

153−

154− var moveDelta = units.gu(5);

155−

156− fakeWindow.x = initialWindowX + moveDelta

157− fakeWindow.y = initialWindowY + moveDelta

158−

159− // This will destroy the window and recreate it

160− windowLoader.active = false;

161− waitForRendering(root);

162− windowLoader.active = true;

163−

164− // Make sure it's again where we left it before destroying

165− tryCompare(fakeWindow, "x", initialWindowX + moveDelta)

166− tryCompare(fakeWindow, "y", initialWindowX + moveDelta)

167− }

168−

169 function test_saveRestoreSize() {

150 function test_saveRestoreSize() {

170 var initialWindowX = fakeWindow.x;

151 var initialWindowX = fakeWindow.x;

171 var initialWindowY = fakeWindow.y;

152 var initialWindowY = fakeWindow.y;