Merge lp:~thomir-deactivatedaccount/autopilot-qt/export-qobject into lp:autopilot-qt
Proposed by
Thomi Richards
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Christopher Lee | ||||
Approved revision: | 79 | ||||
Merged at revision: | 77 | ||||
Proposed branch: | lp:~thomir-deactivatedaccount/autopilot-qt/export-qobject | ||||
Merge into: | lp:autopilot-qt | ||||
Diff against target: |
96 lines (+26/-8) 6 files modified
driver/qtnode.cpp (+5/-6) tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py (+3/-0) tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py (+4/-0) tests/autopilot/libautopilot_qt/tests/test_main.py (+6/-2) tests/autopilot/testapp/qt4.qml (+4/-0) tests/autopilot/testapp/qt5.qml (+4/-0) |
||||
To merge this branch: | bzr merge lp:~thomir-deactivatedaccount/autopilot-qt/export-qobject | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christopher Lee (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+201865@code.launchpad.net |
Commit message
Export QObject children of Qml items.
Description of the change
This branch fixes a bug where QObject-based children of Qml items weren't getting exported in the introspection tree.
All tests pass.
To post a comment you must log in.
PASSED: Continuous integration, rev:77 jenkins. qa.ubuntu. com/job/ autopilot- qt-ci/5/ jenkins. qa.ubuntu. com/job/ autopilot- qt-trusty- amd64-ci/ 5 jenkins. qa.ubuntu. com/job/ autopilot- qt-trusty- armhf-ci/ 5 jenkins. qa.ubuntu. com/job/ autopilot- qt-trusty- armhf-ci/ 5/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/autopilot- qt-ci/5/ rebuild
http://