Merge lp:~zsombi/ubuntu-ui-toolkit/fix-sensingArea-on-phablet into lp:ubuntu-ui-toolkit

[Zsombor Egri]

[inversemaousearea] Fixing sensingArea not updated on phablet.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/117

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yup, that helps!

review: Approve (functional)

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2013-04-18 11:29:24 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2013-05-24 05:36:32 +0000
@@ -29,7 +29,8 @@
 #include <private/qquicktextedit_p.h>
 
 QuickUtils::QuickUtils(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_rootView(0)
 {
     QGuiApplication::instance()->installEventFilter(this);
     // connect to focusObjectChanged() to get the latest active focus object
@@ -44,7 +45,7 @@
  */
 bool QuickUtils::eventFilter(QObject *obj, QEvent *event)
 {
-    if (!m_rootView && (event->type() == QEvent::ChildAdded))
+    if (!m_rootView && (event->type() == QEvent::ApplicationActivate))
         lookupQuickView();
 
     return QObject::eventFilter(obj, event);

=== added file 'tests/unit/tst_inversemousearea/SensingAreaError.qml'
--- tests/unit/tst_inversemousearea/SensingAreaError.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_inversemousearea/SensingAreaError.qml	2013-05-24 05:36:32 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 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 {
+    id: root
+    width: units.gu(40)
+    height: units.gu(40)
+
+    property string log: ""
+
+    MouseArea {
+        anchors.fill: parent
+
+        onClicked: root.log = "MA"
+    }
+
+    Rectangle {
+        width: units.gu(10)
+        height: units.gu(10)
+        anchors.centerIn: parent
+        color: "red"
+
+        InverseMouseArea {
+            anchors.fill: parent
+            sensingArea: root
+            onClicked: root.log = "IMA"
+        }
+    }
+}

=== modified file 'tests/unit/tst_inversemousearea/tst_inversemousearea.pro'
--- tests/unit/tst_inversemousearea/tst_inversemousearea.pro	2013-04-15 07:51:36 +0000
+++ tests/unit/tst_inversemousearea/tst_inversemousearea.pro	2013-05-24 05:36:32 +0000
@@ -4,4 +4,5 @@
 
 OTHER_FILES += \
     InverseMouseAreaPropagateEvents.qml \
-    InverseMouseAreaDoNotPropagateEvents.qml
+    InverseMouseAreaDoNotPropagateEvents.qml \
+    SensingAreaError.qml

=== modified file 'tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp'
--- tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp	2013-04-15 07:49:30 +0000
+++ tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp	2013-05-24 05:36:32 +0000
@@ -132,6 +132,16 @@
         QVERIFY(eventCleanup.isEmpty());
     }
 
+    void testCase_sensingAreaError()
+    {
+        InverseMouseAreaType *area = testArea("SensingAreaError.qml");
+        QVERIFY(area);
+
+        QTest::mouseClick(quickView, Qt::LeftButton, 0, QPoint(20, 20));
+        QTest::waitForEvents();
+        QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
+    }
+
 };
 
 QTEST_MAIN(tst_InverseMouseAreaTest)