webbrowser-app

Merge lp://qastaging/~osomon/webbrowser-app/qquickshortcuts into lp://qastaging/webbrowser-app

  1. qquickshortcuts
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1391
Merged at revision: 1407
Proposed branch: lp://qastaging/~osomon/webbrowser-app/qquickshortcuts
Merge into: lp://qastaging/webbrowser-app
Diff against target: 1198 lines (+666/-337)
12 files modified
src/app/CMakeLists.txt (+3/-1)
src/app/FilteredKeyboardModel.qml (+33/-0)
src/app/browserapplication.cpp (+2/-0)
src/app/qquickshortcut.cpp (+283/-0)
src/app/qquickshortcut_p.h (+109/-0)
src/app/webbrowser/Browser.qml (+200/-258)
src/app/webbrowser/KeyboardShortcut.qml (+0/-25)
src/app/webbrowser/KeyboardShortcuts.qml (+0/-41)
src/app/webbrowser/ListViewHighlight.qml (+2/-3)
src/app/webbrowser/NavigationBar.qml (+10/-7)
tests/autopilot/webbrowser_app/tests/test_keyboard.py (+22/-1)
tests/autopilot/webbrowser_app/tests/test_private.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~osomon/webbrowser-app/qquickshortcuts
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+290299@code.qastaging.launchpad.net

Commit message

Import QQuickShortcut from Qt 5.5 to properly handle window-level keyboard shortcuts.
We cannot bump the dependency on Qt to 5.5 as the stable overlay PPA for devices currently has Qt 5.4.1.

To post a comment you must log in.
lp://qastaging/~osomon/webbrowser-app/qquickshortcuts updated
1389. By Olivier Tilloy

Remove an incorrect condition now that the QInputInfo API is available.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1389
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2677/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6789/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6800/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2677/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~osomon/webbrowser-app/qquickshortcuts updated
1390. By Olivier Tilloy

Fix failing autopilot test.

1391. By Olivier Tilloy

Filter out autopilot-emulated keyboards.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1391
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/111/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/111/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/111/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~osomon/webbrowser-app/qquickshortcuts updated
1392. By Olivier Tilloy

Do not change focus unnecessarily when switching tabs: clear the address bar instead if needed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: