Merge lp:~mzanetti/autopilot-qt/fix-1218971 into lp:autopilot-qt

Proposed by Michael Zanetti on 2013-09-10
Status: Superseded
Proposed branch: lp:~mzanetti/autopilot-qt/fix-1218971
Merge into: lp:autopilot-qt
Diff against target: 15 lines (+5/-0)
1 file modified
driver/qtnode.cpp (+5/-0)
To merge this branch: bzr merge lp:~mzanetti/autopilot-qt/fix-1218971
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2013-11-27
Olivier Tilloy 2013-09-10 Needs Fixing on 2013-11-26
Autopilot Hackers 2013-09-10 Pending
Review via email: mp+184753@code.launchpad.net

This proposal has been superseded by a proposal from 2013-12-02.

Commit message

correctly add QQuickRootItem to the list of QQuickWindow's childs

To post a comment you must log in.
Olivier Tilloy (osomon) wrote :

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) wrote :

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

review: Approve
Olivier Tilloy (osomon) wrote :

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
72. By Michael Zanetti on 2013-11-27

dummy change to make jenkins pick it up

73. By Michael Zanetti on 2013-11-27

revert last change

Unmerged revisions

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'driver/qtnode.cpp'
2--- driver/qtnode.cpp 2013-09-03 04:45:05 +0000
3+++ driver/qtnode.cpp 2013-11-27 09:40:24 +0000
4@@ -188,6 +188,11 @@
5 }
6 }
7
8+ QQuickWindow* window = qobject_cast<QQuickWindow*>(object_);
9+ if (window) {
10+ children.push_back(std::make_shared<QtNode>(window->contentItem(), GetPath()));
11+ }
12+
13 #else
14 foreach (QObject *child, object_->children())
15 {

Subscribers

People subscribed via source and target branches