webbrowser-app

Merge lp:~osomon/webbrowser-app/qt54 into lp:webbrowser-app

  1. qt54
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 837
Merged at revision: 841
Proposed branch: lp:~osomon/webbrowser-app/qt54
Merge into: lp:webbrowser-app
Diff against target: 15 lines (+3/-1)
1 file modified
src/app/browserapplication.cpp (+3/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/qt54
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+243551@code.launchpad.net

Commit message

Fix FTBFS on Qt 5.4.

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

FAILED: Continuous integration, rev:837
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1327/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/489
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/279
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/85/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/85/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/85/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/285
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/285/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/browserapplication.cpp'
2--- src/app/browserapplication.cpp 2014-11-26 10:38:23 +0000
3+++ src/app/browserapplication.cpp 2014-12-03 15:32:47 +0000
4@@ -131,8 +131,10 @@
5 glcontext->create();
6 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
7 QSGContext::setSharedOpenGLContext(glcontext);
8-#else
9+#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
10 QOpenGLContextPrivate::setGlobalShareContext(glcontext);
11+#else
12+ qt_gl_set_global_share_context(glcontext);
13 #endif
14
15 QString devtoolsPort = inspectorPort();

Subscribers

People subscribed via source and target branches

to status/vote changes: