Merge lp:~om26er/messaging-app/fix_introspection into lp:messaging-app

Proposed by Omer Akram
Status: Merged
Approved by: Omer Akram
Approved revision: 65
Merged at revision: 64
Proposed branch: lp:~om26er/messaging-app/fix_introspection
Merge into: lp:messaging-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/messagingapplication.cpp (+1/-1)
To merge this branch: bzr merge lp:~om26er/messaging-app/fix_introspection
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Omer Akram (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+203392@code.launchpad.net

Commit message

Load testability driver if QT_LOAD_TESTABILITY is in the environment

Description of the change

Load testability driver if QT_LOAD_TESTABILITY is in the environment

* Are there any related MPs required for this MP to build/function as expected? Please list.

  No.

* Is your branch in sync with latest trunk

  Yes.

* Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

  Yes.

* Did you successfully run all tests found in your component's Test Plan

  Yes.

* If you changed the UI, was the change specified/approved by design?

  No UI change.

* If you changed the packaging (debian), did you subscribe a core-dev to this MP?

  No Packaging change.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:64
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~om26er/messaging-app/fix_introspection/+merge/203392/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/messaging-app-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4868
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3380

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/112/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Omer Akram (om26er) :
review: Approve
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator? Yes
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator? Yes
Did CI run pass? If not, please explain why. Yes
Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut? Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/messagingapplication.cpp'
2--- src/messagingapplication.cpp 2013-10-10 18:49:23 +0000
3+++ src/messagingapplication.cpp 2014-01-31 17:18:19 +0000
4@@ -83,7 +83,7 @@
5
6 // The testability driver is only loaded by QApplication but not by QGuiApplication.
7 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
8- if (arguments.contains("-testability")) {
9+ if (arguments.contains("-testability") || qgetenv("QT_LOAD_TESTABILITY") == "1") {
10 arguments.removeAll("-testability");
11 QLibrary testLib(QLatin1String("qttestability"));
12 if (testLib.load()) {

Subscribers

People subscribed via source and target branches