webbrowser-app

Merge lp://qastaging/~osomon/webbrowser-app/use-qtsystems into lp://qastaging/webbrowser-app

  1. use-qtsystems
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1570
Proposed branch: lp://qastaging/~osomon/webbrowser-app/use-qtsystems
Merge into: lp://qastaging/webbrowser-app
Diff against target: 1486 lines (+9/-1248)
22 files modified
debian/control (+2/-2)
snapcraft.yaml (+0/-2)
src/app/CMakeLists.txt (+1/-5)
src/app/FilteredKeyboardModel.qml (+2/-2)
src/app/browserapplication.cpp (+0/-6)
src/app/unity8/CMakeLists.txt (+0/-3)
src/app/unity8/README (+0/-11)
src/app/unity8/plugins/CMakeLists.txt (+0/-1)
src/app/unity8/plugins/Unity/CMakeLists.txt (+0/-1)
src/app/unity8/plugins/Unity/InputInfo/CMakeLists.txt (+0/-40)
src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp (+0/-291)
src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h (+0/-98)
src/app/unity8/plugins/Unity/InputInfo/plugin.cpp (+0/-32)
src/app/unity8/plugins/Unity/InputInfo/plugin.h (+0/-30)
src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp (+0/-196)
src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h (+0/-102)
src/app/unity8/plugins/Unity/InputInfo/qinputinfo.cpp (+0/-270)
src/app/unity8/plugins/Unity/InputInfo/qinputinfo.h (+0/-143)
src/app/unity8/plugins/Unity/InputInfo/qmldir (+0/-3)
src/app/webbrowser/Browser.qml (+4/-4)
tests/unittests/qml/CMakeLists.txt (+0/-1)
tests/unittests/qml/tst_QmlTests.cpp (+0/-5)
To merge this branch: bzr merge lp://qastaging/~osomon/webbrowser-app/use-qtsystems
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Olivier Tilloy Needs Fixing
Review via email: mp+309667@code.qastaging.launchpad.net

Commit message

Use the upstream QtSystemInfo instead of embedding an old copy of its source code.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1558
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/720/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1918
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/460
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1919
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1758/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1758
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1758/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Testing this branch on MX4, I’m seeing the following error in the logs when connecting a bluetooth keyboard/mouse combo to the device:

QObject: Cannot create children for a parent that is in a different thread.
(Parent is QInputInfoManagerMir(0xaa09a6ac), parent's thread is QThread(0x1fba0b8), current thread is QThread(0xb08612d8)

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

I filed bug #1638517 to track the issue described above.

lp://qastaging/~osomon/webbrowser-app/use-qtsystems updated
1559. By Olivier Tilloy

Merge the latest changes from trunk and resolve minor conflicts.

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

FAILED: Continuous integration, rev:1559
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/732/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2231/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2234
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2061/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2061/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2061/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2061
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2061/artifact/output/*zip*/output.zip

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

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

Revert apparmor profile changes as the exceptions are still required on X11 (where QtSystemInfo still uses udev and evdev).

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

FAILED: Continuous integration, rev:1560
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/737/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2247
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/585
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2250
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2075/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2075
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2075/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/737/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: