Merge lp:~zsombi/ubuntu-ui-toolkit/inversemouseareaqt52 into lp:ubuntu-ui-toolkit

[Zsombor Egri]

InverseMouseArea API test removed, being a duplicate of the other InverseMouseArea tests. Connecting to th eproper enabledChanged signal in InverseMouseArea resolves the warning in Qt5.2 stating enabledChanged was overwritten in QQuickMouseArea.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:924
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1637/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/585
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2619
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4848
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3358

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1637/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-11-12 11:19:15 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-01-27 07:32:13 +0000
@@ -231,7 +231,12 @@
     m_topmostItem(false),
     m_sensingArea(QuickUtils::instance().rootItem(this))
 {
-    QObject::connect(this, SIGNAL(enabledChanged()), this, SLOT(update()));
+    /*
+     * QQuickMouseArea overrides enabledChanged() signal, therefore we must make sure
+     * we connect to the proper signal.
+     */
+    QObject::connect(this, &QQuickMouseArea::enabledChanged,
+                     this, &InverseMouseAreaType::update);
 
     if (!m_sensingArea) {
         // get sensing area upon parent change

=== removed file 'tests/unit_x11/tst_components/tst_inversemousearea.qml'
--- tests/unit_x11/tst_components/tst_inversemousearea.qml	2013-08-05 12:23:16 +0000
+++ tests/unit_x11/tst_components/tst_inversemousearea.qml	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 0.1
-
-Item {
-    id: testCase
-    width: 100; height: 100
-
-    Item {
-        id: testSensingArea
-        anchors{
-            fill: parent
-            topMargin: 5
-        }
-    }
-
-    MouseArea {
-        id: fullArea
-        anchors.fill: parent
-    }
-
-    InverseMouseArea {
-        id: ima
-        x: 10; y: 10
-        width: 10; height: 10
-        property bool acceptPressEvent: true
-        property bool acceptClickEvent: true
-        onPressed: mouse.accepted = acceptPressEvent
-        onClicked: mouse.accepted = acceptClickEvent
-    }
-
-    TestCase {
-        name: "InverseMouseAreaAPI"
-        when: windowShown
-
-        SignalSpy {
-            id: masterSpy
-            target: fullArea
-        }
-
-        SignalSpy {
-            id: signalSpy
-            target: ima
-        }
-
-        function test_0_pressed() {
-            compare(ima.pressed, false, "InverseMouseArea is not pressed by default");
-            try {
-                ima.pressed = true;
-                compare(true, false, "This should not be reached");
-            } catch (e) {
-                //expect failure
-            }
-            compare(ima.pressed, false, "InverseMouseArea is not pressed by default");
-        }
-
-        function test_0_acceptedButtons() {
-            compare(ima.acceptedButtons, Qt.LeftButton, "InverseMouseArea accepts LeftButton by default");
-            ima.acceptedButtons = Qt.LeftButton | Qt.RightButton;
-            compare(ima.acceptedButtons, Qt.LeftButton | Qt.RightButton, "InverseMouseArea acceptButtons is not properly set");
-            ima.acceptedButtons = Qt.RightButton;
-            compare(ima.acceptedButtons, Qt.RightButton, "InverseMouseArea acceptButtons is not properly set");
-            ima.acceptedButtons = Qt.MiddleButton;
-            compare(ima.acceptedButtons, Qt.MiddleButton, "InverseMouseArea acceptButtons is not properly set");
-            ima.acceptedButtons = Qt.AllButtons;
-            compare(ima.acceptedButtons, Qt.AllButtons, "InverseMouseArea acceptButtons is not properly set");
-        }
-
-        function test_0_pressedButtons() {
-            compare(ima.pressedButtons, Qt.NoButton, "InverseMouseArea has NoButton pressed by default");
-            try {
-                ima.pressed = Qt.LeftButton;
-                compare(true, false, "This should not be reached");
-            } catch (e) {
-                //expect failure
-            }
-            compare(ima.pressedButtons, Qt.NoButton, "InverseMouseArea has NoButton pressed by default");
-        }
-
-        function test_0_propagateComposedEvents() {
-            compare(ima.propagateComposedEvents, false, "InverseMouseArea does not propagate composed events by default");
-            ima.propagateComposedEvents = true;
-            compare(ima.propagateComposedEvents, true, "InverseMouseArea does propagates composed events");
-        }
-
-        function test_0_sensingArea() {
-            compare(ima.sensingArea, QuickUtils.rootItem(ima), "InverseMouseArea senses the root item area");
-            ima.sensingArea = testSensingArea
-            compare(ima.sensingArea, testSensingArea, "InverseMouseArea sensing area set to testSensingArea");
-        }
-
-        function test_signals_data() {
-            return [
-                {signal: "onPressed", propagate: false, sensing: null, item: testCase, x: 1, y: 1, master: 0, inverse: 1, acceptClickEvent: false},
-                {signal: "onPressed", propagate: true, sensing: null, item: testCase, x: 1, y: 1, master: 1, inverse: 1, acceptPressEvent: false},
-                {signal: "onPressed", propagate: false, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-                {signal: "onPressed", propagate: true, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-
-                {signal: "onReleased", propagate: false, sensing: null, item: testCase, x: 1, y: 1, master: 0, inverse: 1, acceptClickEvent: false},
-                {signal: "onReleased", propagate: true, sensing: null, item: testCase, x: 1, y: 1, master: 1, inverse: 0, acceptPressEvent: false},
-                {signal: "onReleased", propagate: false, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-                {signal: "onReleased", propagate: true, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-
-                {signal: "onClicked", propagate: false, sensing: null, item: testCase, x: 1, y: 1, master: 0, inverse: 1},
-                {signal: "onClicked", propagate: true, sensing: null, item: testCase, x: 1, y: 1, master: 1, inverse: 1, acceptClickEvent: false},
-                {signal: "onClicked", propagate: false, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-                {signal: "onClicked", propagate: true, sensing: testSensingArea, item: testCase, x: 1, y: 1, master: 1, inverse: 0},
-            ];
-        }
-
-        function test_signals(data) {
-            masterSpy.clear();
-            signalSpy.clear();
-            masterSpy.signalName = data.signal;
-            signalSpy.signalName = data.signal;
-            if (data.acceptPressEvent !== undefined) {
-                ima.acceptPressEvent = data.acceptPressEvent;
-            } else {
-                ima.acceptPressEvent = true;
-            }
-            if (data.acceptClickEvent !== undefined) {
-                ima.acceptClickEvent = data.acceptClickEvent;
-            } else {
-                ima.acceptClickEvent = true;
-            }
-
-            ima.acceptedButtons = Qt.LeftButton;
-            ima.propagateComposedEvents = data.propagate;
-            ima.sensingArea = data.sensing;
-
-            mouseClick(testCase, data.x, data.y);
-            tryCompare(masterSpy, "count", data.master, 100);
-            tryCompare(signalSpy, "count", data.inverse, 100);
-        }
-    }
-}
-

=== added file 'tests/unit_x11/tst_inversemousearea/Defaults.qml'
--- tests/unit_x11/tst_inversemousearea/Defaults.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_inversemousearea/Defaults.qml	2014-01-27 07:32:13 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    InverseMouseArea {
+        objectName: "testItem"
+    }
+}

=== modified file 'tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro'
--- tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro	2013-10-29 17:16:45 +0000
+++ tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro	2014-01-27 07:32:13 +0000
@@ -14,4 +14,5 @@
     InverseMouseAreaNormalEventStack.qml \
     InverseMouseAreaTopmostItem.qml \
     InverseMouseAreaSensingArea.qml \
-    InverseMouseAreaOnTopNoAccept.qml
+    InverseMouseAreaOnTopNoAccept.qml \
+    Defaults.qml

=== modified file 'tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp'
--- tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp	2013-10-29 17:16:45 +0000
+++ tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp	2014-01-27 07:32:13 +0000
@@ -89,6 +89,16 @@
         delete quickView;
     }
 
+    void testCase_Defaults()
+    {
+        InverseMouseAreaType *area = testArea("Defaults.qml");
+        QVERIFY(area);
+
+        QCOMPARE(area->pressed(), false);
+        QCOMPARE(area->acceptedButtons(), Qt::LeftButton);
+        QCOMPARE(area->pressedButtons(), Qt::NoButton);
+        QCOMPARE(area->propagateComposedEvents(), false);
+    }
     void testCase_DoNotPropagateEvents()
     {
         eventCleanup.clear();