qtubuntu

Merge lp://staging/~mitya57/qtubuntu/qt5.9 into lp://staging/qtubuntu

  1. qt5.9
  2. Merge into trunk
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Gianfranco Costamagna
Approved revision: 394
Merged at revision: 394
Proposed branch: lp://staging/~mitya57/qtubuntu/qt5.9
Merge into: lp://staging/qtubuntu
Diff against target: 152 lines (+20/-17)
10 files modified
src/shared/ubuntutheme.h (+1/-1)
src/ubuntuappmenu/ubuntuappmenu.pro (+1/-1)
src/ubuntumirclient/qmirclientbackingstore.cpp (+1/-1)
src/ubuntumirclient/qmirclientglcontext.cpp (+2/-2)
src/ubuntumirclient/qmirclientglcontext.h (+1/-1)
src/ubuntumirclient/qmirclientintegration.cpp (+5/-5)
src/ubuntumirclient/qmirclientplatformservices.h (+2/-2)
src/ubuntumirclient/qmirclientscreen.cpp (+1/-1)
src/ubuntumirclient/qmirclientwindow.cpp (+1/-1)
src/ubuntumirclient/ubuntumirclient.pro (+5/-2)
To merge this branch: bzr merge lp://staging/~mitya57/qtubuntu/qt5.9
Reviewer Review Type Date Requested Status
Gerry Boland (community) code Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+326988@code.staging.launchpad.net

Commit message

Fix build with Qt 5.9 and new MIR.

Description of the change

Fix building with new Qt and new MIR.

The new Qt is being prepared in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/2819/+packages, I will add this MP to my Bileto ticket and land it together with Qt 5.9.

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

FAILED: Continuous integration, rev:394
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/226/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4927/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4955
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4762/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Changes look sensible. I'll need to test it though

review: Approve (code)
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

I like them, I would like to see them merged to have 5.9 land

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