Merge lp://qastaging/~osomon/webbrowser-app/wide-views-newtab-history into lp://qastaging/webbrowser-app
Proposed by
Olivier Tilloy
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Olivier Tilloy | ||||||||
| Approved revision: | 1131 | ||||||||
| Merged at revision: | 1128 | ||||||||
| Proposed branch: | lp://qastaging/~osomon/webbrowser-app/wide-views-newtab-history | ||||||||
| Merge into: | lp://qastaging/webbrowser-app | ||||||||
| Diff against target: |
3866 lines (+2910/-200) 39 files modified
debian/control (+1/-0) src/app/webbrowser/Browser.qml (+133/-66) src/app/webbrowser/CMakeLists.txt (+2/-0) src/app/webbrowser/DraggableUrlDelegateWide.qml (+98/-0) src/app/webbrowser/HistorySectionDelegate.qml (+6/-4) src/app/webbrowser/HistoryViewWide.qml (+418/-0) src/app/webbrowser/NewTabViewWide.qml (+317/-0) src/app/webbrowser/UrlDelegate.qml (+8/-1) src/app/webbrowser/UrlDelegateWide.qml (+86/-0) src/app/webbrowser/UrlsList.qml (+2/-2) src/app/webbrowser/bookmarks-folder-model.cpp (+21/-1) src/app/webbrowser/bookmarks-folder-model.h (+1/-0) src/app/webbrowser/bookmarks-folderlist-model.cpp (+5/-0) src/app/webbrowser/bookmarks-folderlist-model.h (+2/-0) src/app/webbrowser/history-lastvisitdate-model.cpp (+93/-0) src/app/webbrowser/history-lastvisitdate-model.h (+60/-0) src/app/webbrowser/history-lastvisitdatelist-model.cpp (+210/-0) src/app/webbrowser/history-lastvisitdatelist-model.h (+72/-0) src/app/webbrowser/history-model.cpp (+15/-0) src/app/webbrowser/history-model.h (+1/-0) src/app/webbrowser/webbrowser-app.cpp (+4/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+81/-5) tests/autopilot/webbrowser_app/tests/__init__.py (+8/-2) tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py (+2/-6) tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+32/-46) tests/autopilot/webbrowser_app/tests/test_findinpage.py (+1/-2) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+121/-43) tests/autopilot/webbrowser_app/tests/test_private.py (+8/-13) tests/autopilot/webbrowser_app/tests/test_tabs.py (+2/-6) tests/unittests/CMakeLists.txt (+2/-0) tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp (+6/-3) tests/unittests/history-lastvisitdate-model/CMakeLists.txt (+11/-0) tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp (+116/-0) tests/unittests/history-lastvisitdatelist-model/CMakeLists.txt (+11/-0) tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp (+371/-0) tests/unittests/qml/CMakeLists.txt (+11/-0) tests/unittests/qml/tst_HistoryViewWide.qml (+184/-0) tests/unittests/qml/tst_NewTabViewWide.qml (+372/-0) tests/unittests/qml/tst_QmlTests.cpp (+16/-0) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/wide-views-newtab-history | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Wide screen versions of the history view and new tab view, per design specification.
This adds a build dependency on qml-module-
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:1129
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://