Merge lp://qastaging/~osomon/webbrowser-app/bookmarks-proxy-model into lp://qastaging/webbrowser-app
Proposed by
Olivier Tilloy
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~osomon/webbrowser-app/bookmarks-proxy-model |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
2398 lines (+1610/-331) 20 files modified
src/app/webbrowser/BookmarksFoldersView.qml (+92/-156) src/app/webbrowser/BookmarksView.qml (+3/-3) src/app/webbrowser/CMakeLists.txt (+1/-0) src/app/webbrowser/NewTabView.qml (+9/-7) src/app/webbrowser/bookmarks-model.cpp (+1/-1) src/app/webbrowser/collapsible-bookmarks-model.cpp (+572/-0) src/app/webbrowser/collapsible-bookmarks-model.h (+98/-0) src/app/webbrowser/webbrowser-app.cpp (+2/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+83/-43) tests/autopilot/webbrowser_app/tests/__init__.py (+1/-6) tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+33/-29) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+43/-77) tests/autopilot/webbrowser_app/tests/test_private.py (+4/-2) tests/autopilot/webbrowser_app/tests/test_site_previews.py (+1/-1) tests/unittests/CMakeLists.txt (+1/-0) tests/unittests/collapsible-bookmarks-model/CMakeLists.txt (+13/-0) tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp (+645/-0) tests/unittests/qml/CMakeLists.txt (+1/-0) tests/unittests/qml/tst_BookmarksView.qml (+5/-6) tests/unittests/qml/tst_QmlTests.cpp (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/bookmarks-proxy-model |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+279277@code.qastaging.launchpad.net |
Commit message
Add a C++ model for the narrow bookmarks view: CollapsibleBook
To post a comment you must log in.
Unmerged revisions
- 1308. By Olivier Tilloy
-
Add documentation to the CollapsibleBook
marksModel class. - 1307. By Olivier Tilloy
-
Use the top-level bookmarks view in test_bookmark_
options. py, instead of going through the new tab view. - 1306. By Olivier Tilloy
-
Minor autopilot test improvements.
- 1305. By Olivier Tilloy
-
Fix a number of autopilot test failures.
- 1304. By Olivier Tilloy
-
More test coverage.
- 1303. By Olivier Tilloy
-
More test coverage.
- 1302. By Olivier Tilloy
-
More test coverage.
- 1301. By Olivier Tilloy
-
More test coverage.
- 1300. By Olivier Tilloy
-
More test coverage.
- 1299. By Olivier Tilloy
-
More test coverage.
PASSED: Continuous integration, rev:1308 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 2498/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 5551 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- amd64-ci/ 1252 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 1252 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 1252/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- i386-ci/ 1252 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-touch/ 4347 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 5565 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 5565/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 25719
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 2498/rebuild
http://