qmenumodel

Merge lp://staging/~larsu/qmenumodel/lp1217335 into lp://staging/~phablet-team/qmenumodel/trunk

  1. lp1217335
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Nick Dedekind
Approved revision: 79
Merged at revision: 80
Proposed branch: lp://staging/~larsu/qmenumodel/lp1217335
Merge into: lp://staging/~phablet-team/qmenumodel/trunk
Diff against target: 16 lines (+3/-3)
1 file modified
tests/client/CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp://staging/~larsu/qmenumodel/lp1217335
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Nick Dedekind (community) Approve
Timo Jyrinki Approve
Review via email: mp+182437@code.staging.launchpad.net

Commit message

Make sure the right qt modules are loaded to make QMenuModel tests pass

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good! Builds fine both locally and in PPA now against Qt 5.1.1. https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3449047/+listing-archive-extra

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

FAILED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/28/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-amd64-ci/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qmenumodel-ci/28/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

LGTM.
Confirmed tests working locally on Qt 5.1.1.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (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