Merge lp://qastaging/~artmello/webbrowser-app/webbrowser-app-fix_1484562 into lp://qastaging/webbrowser-app
Proposed by
Arthur Mello
Status: | Merged |
---|---|
Approved by: | Olivier Tilloy |
Approved revision: | 1155 |
Merged at revision: | 1148 |
Proposed branch: | lp://qastaging/~artmello/webbrowser-app/webbrowser-app-fix_1484562 |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
359 lines (+148/-53) 6 files modified
src/app/webbrowser/Browser.qml (+0/-1) src/app/webbrowser/HistoryViewWide.qml (+60/-36) src/app/webbrowser/history-model.cpp (+31/-0) src/app/webbrowser/history-model.h (+2/-0) tests/unittests/history-model/tst_HistoryModelTests.cpp (+11/-0) tests/unittests/qml/tst_HistoryViewWide.qml (+44/-16) |
To merge this branch: | bzr merge lp://qastaging/~artmello/webbrowser-app/webbrowser-app-fix_1484562 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Olivier Tilloy | Approve | ||
Review via email:
|
Commit message
Add support for removing history entries with delete key in HistoryViewWide
Description of the change
Add support for removing history entries with delete key in HistoryViewWide
To post a comment you must log in.
FAILED: Continuous integration, rev:1140 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 2101/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 3741 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- amd64-ci/ 855 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 855 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 855/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- i386-ci/ 855 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 3090 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 3738 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 3738/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 22599
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 2101/rebuild
http://