Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/newOpenGlPrivates into lp:ubuntu-ui-toolkit/staging

  1. newOpenGlPrivates
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 1353
Merged at revision: 1354
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/newOpenGlPrivates
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 19 lines (+5/-3)
1 file modified
tests/launcher/launcher.cpp (+5/-3)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/newOpenGlPrivates
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+243373@code.launchpad.net

Commit message

Use new qt_gl_set_global_share_context setter with 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:1353
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/387/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16389

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1301/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Success with 5.4 RC: https://launchpad.net/~canonical-qt5-edgers/+archive/ubuntu/qt5-beta2/+sourcepub/4598501/+listing-archive-extra

Excellent!

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
1=== modified file 'tests/launcher/launcher.cpp'
2--- tests/launcher/launcher.cpp 2014-11-18 13:38:48 +0000
3+++ tests/launcher/launcher.cpp 2014-12-02 10:29:14 +0000
4@@ -64,10 +64,12 @@
5 // Oxide and QWebEngine need a shared context
6 QScopedPointer<QOpenGLContext> shareContext;
7 shareContext.reset(new QOpenGLContext);
8-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
9+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
10+ qt_gl_set_global_share_context(shareContext.data());
11+#elif QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
12+ QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
13+#else
14 QSGContext::setSharedOpenGLContext(shareContext.data());
15-#else
16- QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
17 #endif
18 QGuiApplication::setApplicationName("UITK Launcher");
19 QGuiApplication application(argc, (char**)argv);

Subscribers

People subscribed via source and target branches