Merge lp:~mzanetti/autopilot-qt/fix-crash-with-maliit into lp:autopilot-qt

[Michael Zanetti]

fix crash if the application does dirty tricks with the QtQuickView's rootObject

This wouldn't happen in normal circumstances, but some apps need to mess with this.
For example maliit-server needs to destroy the views root item when the OSK is hidden.

[lp:~mzanetti/autopilot-qt/fix-crash-with-maliit]

64. By Michael Zanetti on 2013-06-19

release

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-saucy-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-qt-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/autopilot-qt/fix-crash-with-maliit]

65. By Michael Zanetti on 2013-06-19

really release

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-qt-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-qt-ci/63/rebuild

review: Approve (continuous-integration)

[Chris Gagnon (chris.gagnon)]

it works approved!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 07:08:47 +0000
+++ debian/changelog	2013-06-19 12:32:29 +0000
@@ -1,3 +1,9 @@
+autopilot-qt (1.3daily13.06.05-0ubuntu2) saucy; urgency=low
+
+  * fix crash with maliit-server
+
+ -- Michael Zanetti <[e-mail]>  Wed, 19 Jun 2013 14:27:21 +0200
+
 autopilot-qt (1.3daily13.06.05-0ubuntu1) saucy; urgency=low
 
   [ Michael Zanetti ]

=== modified file 'driver/qtnode.cpp'
--- driver/qtnode.cpp	2013-04-18 04:27:22 +0000
+++ driver/qtnode.cpp	2013-06-19 12:32:29 +0000
@@ -100,7 +100,7 @@
     // - In case it is not a QQuickItem, fall back to the standard QObject hierarchy
 
     QQuickView *view = qobject_cast<QQuickView*>(object_);
-    if (view) {
+    if (view && view->rootObject() != 0) {
         children.push_back(std::make_shared<QtNode>(view->rootObject(), GetPath()));
     }