ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-qt56 into lp:ubuntu-keyboard

  1. fix-qt56
  2. Merge into trunk
Proposed by Michael Sheldon on 2016-07-31
Status: Merged
Approved by: Bill Filler on 2016-08-02
Approved revision: 497
Merged at revision: 501
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-qt56
Merge into: lp:ubuntu-keyboard
Diff against target: 12 lines (+1/-1)
1 file modified
tests/unittests/common-check.pri (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-qt56
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2016-08-01
Ubuntu Phablet Team 2016-07-31 Pending
Review via email: mp+301601@code.launchpad.net

Commit Message

Fix building against Qt 5.6.1

Description of the Change

Fix building against Qt 5.6.1

To post a comment you must log in.
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:497
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/27/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1096
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/226
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1096
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/993
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/993
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/993
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/982/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/982
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/982/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/27/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unittests/common-check.pri'
2--- tests/unittests/common-check.pri 2013-11-04 17:48:55 +0000
3+++ tests/unittests/common-check.pri 2016-08-01 00:06:43 +0000
4@@ -9,7 +9,7 @@
5 DATA_DIR = $$PWD/../../data
6 PLUGIN_BUILD_DIR = $$OUT_PWD/../../../src/plugin
7
8-check.commands = \
9+check.commands = env \
10 MALIIT_PLUGINS_DATADIR=$$DATA_DIR \
11 MALIIT_KEYBOARD_DATADIR=$$DATA_DIR \
12 LD_LIBRARY_PATH=$$PLUGIN_BUILD_DIR:$$MALIIT_INSTALL_LIBS:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)

Subscribers

People subscribed via source and target branches