webbrowser-app

Merge lp://staging/~osomon/webbrowser-app/uitk-1.3 into lp://staging/webbrowser-app

  1. uitk-1.3
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1129
Merged at revision: 1120
Proposed branch: lp://staging/~osomon/webbrowser-app/uitk-1.3
Merge into: lp://staging/webbrowser-app
Diff against target: 2077 lines (+291/-292)
105 files modified
debian/control (+12/-12)
doc/WebView.qdoc (+2/-2)
src/Ubuntu/Web/ItemSelector02.qml (+5/-5)
src/Ubuntu/Web/Selection.qml (+3/-3)
src/Ubuntu/Web/SelectionHandle.qml (+3/-3)
src/Ubuntu/Web/UbuntuSharedWebContext.qml (+1/-1)
src/Ubuntu/Web/UbuntuWebContext.qml (+1/-1)
src/Ubuntu/Web/UbuntuWebView02.qml (+4/-4)
src/app/AlertDialog.qml (+3/-3)
src/app/AuthenticationDialog.qml (+4/-4)
src/app/BeforeUnloadDialog.qml (+3/-3)
src/app/BrowserView.qml (+2/-2)
src/app/BrowserWindow.qml (+3/-3)
src/app/CertificateVerificationDialog.qml (+4/-4)
src/app/ChromeBase.qml (+2/-2)
src/app/ChromeButton.qml (+3/-3)
src/app/ChromeController.qml (+1/-1)
src/app/ConfirmDialog.qml (+3/-3)
src/app/ContentDownloadDialog.qml (+4/-4)
src/app/ContentPickerDialog.qml (+4/-4)
src/app/ContentShareDialog.qml (+4/-4)
src/app/Downloader.qml (+4/-4)
src/app/ErrorSheet.qml (+3/-3)
src/app/Favicon.qml (+2/-2)
src/app/FilePickerDialog.qml (+4/-4)
src/app/GeolocationPermissionRequest.qml (+4/-4)
src/app/InvalidCertificateErrorSheet.qml (+3/-3)
src/app/KeyboardRectangle.qml (+3/-3)
src/app/ModalDialog.qml (+4/-4)
src/app/PromptDialog.qml (+3/-3)
src/app/ProxyAuthenticationDialog.qml (+2/-2)
src/app/Share.qml (+4/-4)
src/app/ThinProgressBar.qml (+2/-2)
src/app/WebViewImpl.qml (+3/-3)
src/app/actions/Back.qml (+2/-2)
src/app/actions/Bookmark.qml (+2/-2)
src/app/actions/BookmarkLink.qml (+2/-2)
src/app/actions/ClearHistory.qml (+2/-2)
src/app/actions/Copy.qml (+2/-2)
src/app/actions/CopyImage.qml (+2/-2)
src/app/actions/CopyLink.qml (+2/-2)
src/app/actions/Forward.qml (+2/-2)
src/app/actions/GoTo.qml (+2/-2)
src/app/actions/NewTab.qml (+2/-2)
src/app/actions/OpenImageInNewTab.qml (+2/-2)
src/app/actions/OpenLinkInNewBackgroundTab.qml (+2/-2)
src/app/actions/OpenLinkInNewTab.qml (+2/-2)
src/app/actions/Reload.qml (+2/-2)
src/app/actions/SaveImage.qml (+2/-2)
src/app/actions/ShareLink.qml (+2/-2)
src/app/webbrowser/AddressBar.qml (+17/-21)
src/app/webbrowser/BookmarkOptions.qml (+3/-3)
src/app/webbrowser/BookmarksFolderListView.qml (+3/-3)
src/app/webbrowser/BookmarksModel.qml (+2/-2)
src/app/webbrowser/BottomEdgeHandle.qml (+1/-1)
src/app/webbrowser/Browser.qml (+4/-4)
src/app/webbrowser/Chrome.qml (+2/-2)
src/app/webbrowser/ExpandedHistoryView.qml (+2/-2)
src/app/webbrowser/HistoryModel.qml (+2/-2)
src/app/webbrowser/HistorySectionDelegate.qml (+3/-3)
src/app/webbrowser/HistoryView.qml (+2/-2)
src/app/webbrowser/KeyboardShortcut.qml (+2/-2)
src/app/webbrowser/KeyboardShortcuts.qml (+1/-1)
src/app/webbrowser/LeavePrivateModeDialog.qml (+3/-3)
src/app/webbrowser/NavigationBar.qml (+2/-2)
src/app/webbrowser/NewPrivateTabView.qml (+2/-2)
src/app/webbrowser/NewTabView.qml (+2/-2)
src/app/webbrowser/SearchEngines.qml (+1/-1)
src/app/webbrowser/SearchSuggestions.qml (+1/-1)
src/app/webbrowser/SecurityCertificatePopover.qml (+4/-4)
src/app/webbrowser/SettingsPage.qml (+4/-4)
src/app/webbrowser/SettingsPageHeader.qml (+4/-3)
src/app/webbrowser/Suggestion.qml (+3/-3)
src/app/webbrowser/Suggestions.qml (+3/-3)
src/app/webbrowser/TabChrome.qml (+2/-2)
src/app/webbrowser/TabPreview.qml (+2/-2)
src/app/webbrowser/TabsBar.qml (+2/-2)
src/app/webbrowser/TabsList.qml (+2/-2)
src/app/webbrowser/Toolbar.qml (+2/-2)
src/app/webbrowser/ToolbarAction.qml (+3/-3)
src/app/webbrowser/UrlDelegate.qml (+2/-2)
src/app/webbrowser/UrlsList.qml (+2/-2)
src/app/webbrowser/webbrowser-app.qml (+3/-3)
src/app/webcontainer/AccountChooserDialog.qml (+4/-4)
src/app/webcontainer/AccountErrorScreen.qml (+2/-2)
src/app/webcontainer/AccountItem.qml (+4/-4)
src/app/webcontainer/AccountsLogic.qml (+1/-1)
src/app/webcontainer/AccountsPage.qml (+2/-2)
src/app/webcontainer/AccountsSplashScreen.qml (+2/-2)
src/app/webcontainer/Chrome.qml (+3/-3)
src/app/webcontainer/OnlineAccountsController.qml (+1/-1)
src/app/webcontainer/PopupWindowController.qml (+4/-4)
src/app/webcontainer/PopupWindowOverlay.qml (+4/-4)
src/app/webcontainer/SplashScreen.qml (+2/-2)
src/app/webcontainer/WebApp.qml (+2/-2)
src/app/webcontainer/WebViewImplOxide.qml (+4/-4)
src/app/webcontainer/WebappContainerWebview.qml (+3/-3)
src/app/webcontainer/webapp-container.qml (+3/-3)
tests/autopilot/webbrowser_app/emulators/browser.py (+3/-2)
tests/unittests/qml/tst_AddressBar.qml (+4/-3)
tests/unittests/qml/tst_BrowserTab.qml (+1/-1)
tests/unittests/qml/tst_SearchEngines.qml (+1/-1)
tests/unittests/qml/tst_TabsBar.qml (+1/-1)
tests/unittests/qml/tst_UbuntuWebView02.qml (+2/-2)
tests/unittests/tabs-model/tst_TabsModelTests.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~osomon/webbrowser-app/uitk-1.3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ugo Riboni (community) Approve
Review via email: mp+267544@code.staging.launchpad.net

Commit message

Update all imports of:
 - Ubuntu.Components to 1.3
 - QtQuick to 2.4
 - QtQuick.Window to 2.2

This bumps the required versions of qtdeclarative5-ubuntu-ui-toolkit-plugin, qml-module-qtquick2 and qml-module-qtquick-window2 in debian/control.

Description of the change

Update all imports of:
 - Ubuntu.Components to 1.3
 - QtQuick to 2.4
 - QtQuick.Window to 2.2

To post a comment you must log in.
lp://staging/~osomon/webbrowser-app/uitk-1.3 updated
1129. By Olivier Tilloy

Revert an incorrect copyright header update.

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

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2050/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/804
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/804
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3629
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22428

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2051/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/805
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/805
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3630
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22431

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2054/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/808
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/808
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3633
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22435

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

The default Popover size seems to have been changed to something that is not large enough to contain the text of the "open this link in another tab" contextual action.

Other than that LGTM and all tests pass.

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

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2055/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/809
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/809
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3636
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22438

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2058/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/812
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/812/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/812
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3644
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3644/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22447

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2059/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/813
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/813
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3645
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3645/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22449

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1129
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2060/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/814
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/814
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22453

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

review: Needs Fixing (continuous-integration)

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: