Merge lp:~thomir-deactivatedaccount/autopilot-qt/fix-1218971 into lp:autopilot-qt

[Thomi Richards]

Add support for QQuickRootItem.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

I’m testing with the example QML attached to bug #1218971, and it’s definitely better, but I’m now seeing two instances of the Dialog component as children of the QQuickRootItem (with the same id, so it’s the same instance listed twice). That’s one too many.

review: Needs Fixing

[Olivier Tilloy (osomon)]

Looks good, and I verified that it fixes bug #1218971. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-armhf-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-i386-autolanding/1/console
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/3105/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-amd64-autolanding/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-armhf-autolanding/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-i386-autolanding/4/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3419/console

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Looks like this fails to build now:

/usr/include/c++/4.8/ext/new_allocator.h:120:4: error: no matching function for call to ‘QtNode::QtNode(QQuickItem*, std::basic_string<char>)’
  { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
    ^
/usr/include/c++/4.8/ext/new_allocator.h:120:4: note: candidates are:
qtnode.cpp:48:1: note: QtNode::QtNode(QObject*)
 QtNode::QtNode(QObject* obj)
 ^
qtnode.cpp:48:1: note: candidate expects 1 argument, 2 provided
qtnode.cpp:40:1: note: QtNode::QtNode(QObject*, QtNode::Ptr)
 QtNode::QtNode(QObject *obj, QtNode::Ptr parent)
 ^
qtnode.cpp:40:1: note: no known conversion for argument 2 from ‘std::basic_string<char>’ to ‘QtNode::Ptr {aka std::shared_ptr<const QtNode>}’
In file included from qtnode.cpp:1:0:
qtnode.h:27:7: note: QtNode::QtNode(const QtNode&)
 class QtNode: public xpathselect::Node, public std::enable_shared_from_this<QtNode>
       ^
qtnode.h:27:7: note: candidate expects 1 argument, 2 provided
qtnode.h:27:7: note: QtNode::QtNode(QtNode&&)
qtnode.h:27:7: note: candidate expects 1 argument, 2 provided

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-i386-ci/3/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-trusty-i386-ci/4

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good and I verified that it fixes bug #1218971.

However I’m also seeing that all elements that are parented to the window appear twice in the hierarchy of objects: once under QQuickWindow, and once under QQuickRootItem. See for yourself with this example:

    import QtQuick 2.0
    import QtQuick.Window 2.0
    import Ubuntu.Components 0.1
    Window {
        width: units.gu(40)
        height: units.gu(20)
        Button {
            text: "test"
        }
    }

This will probably break existing tests that make use of select_single(…).
Ideally, QQuickRootItem shouldn’t appear in the hierarchy of objects, its children should be parented to the QQuickWindow directly (and de-duplicated if needed).

review: Needs Fixing

Unmerged revisions

74. By Thomi Richards on 2013-12-02

Merged trunk, fixed build error.

73. By Michael Zanetti on 2013-11-27

revert last change

72. By Michael Zanetti on 2013-11-27

dummy change to make jenkins pick it up

71. By Michael Zanetti on 2013-10-28

correctly add QQuickRootItem to the list of QQuickWindow's childs

=== modified file 'driver/qtnode.cpp'
--- driver/qtnode.cpp	2013-09-03 04:45:05 +0000
+++ driver/qtnode.cpp	2013-12-02 20:36:52 +0000
@@ -188,6 +188,11 @@
         }
     }
 
+    QQuickWindow* window = qobject_cast<QQuickWindow*>(object_);
+    if (window) {
+        children.push_back(std::make_shared<QtNode>(window->contentItem(), shared_from_this()));
+    }
+
 #else
     foreach (QObject *child, object_->children())
     {