Unity 8

Merge lp://staging/~lukas-kde/unity8/workaround-broken-BorderImage into lp://staging/unity8

  1. workaround-broken-BorderImage
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp://staging/~lukas-kde/unity8/workaround-broken-BorderImage
Merge into: lp://staging/unity8
Diff against target: 100 lines (+8/-8)
6 files modified
qml/Dash/PageHeaderExtraPanel.qml (+1/-1)
qml/Greeter/LoginAreaContainer.qml (+1/-1)
qml/Notifications/Notification.qml (+1/-1)
qml/Panel/Panel.qml (+3/-3)
qml/Stage/ChildWindow.qml (+1/-1)
qml/Stage/DecoratedWindow.qml (+1/-1)
To merge this branch: bzr merge lp://staging/~lukas-kde/unity8/workaround-broken-BorderImage
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+319446@code.staging.launchpad.net

Commit message

Workaround broken BorderImage loading

Description of the change

Workaround broken BorderImage loading

"Fixes" bug lp:1671449

Most likely caused by https://code.launchpad.net/~aacid/ubuntu-ui-toolkit/save_stat_loading_already_loaded_image/+merge/316235

Not nice but proposing here in case we need a quick fix

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3321/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4371
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2616
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2616
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4399
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4232/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3321/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in qml/Stage/DecoratedWindow.qml
1 conflicts encountered.

Should we discard it in favour of the UITK fix? Is it supposed to be landing "really soon now"

Revision history for this message
Michał Sawicz (saviq) wrote :

Yeah UITK's under QA now: https://bileto.ubuntu.com/#/ticket/2647

review: Disapprove

Unmerged revisions

2841. By Lukáš Tinkl

workaround broken BorderImage loading

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