Online Accounts setup for Ubuntu Touch

Merge lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/fix_qt54_buildfail_new_function into lp:ubuntu-system-settings-online-accounts

  1. fix_qt54_buildfail_new_function
  2. Merge into trunk
Proposed by Timo Jyrinki on 2015-02-09
Status: Merged
Approved by: Timo Jyrinki on 2015-02-16
Approved revision: 229
Merged at revision: 232
Proposed branch: lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/fix_qt54_buildfail_new_function
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 19 lines (+5/-3)
1 file modified
online-accounts-ui/main.cpp (+5/-3)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/fix_qt54_buildfail_new_function
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-02-09
Online Accounts 2015-02-09 Pending
Review via email: mp+249069@code.launchpad.net

Commit Message

Use qt_gl_set_global_share_context with Qt 5.4 (LP: #1398372)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-ui/main.cpp'
2--- online-accounts-ui/main.cpp 2015-01-13 09:11:02 +0000
3+++ online-accounts-ui/main.cpp 2015-02-09 13:30:41 +0000
4@@ -76,10 +76,12 @@
5 // Enable compositing in oxide
6 QOpenGLContext *glcontext = new QOpenGLContext();
7 glcontext->create();
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(glcontext);
11+#elif QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
12+ QOpenGLContextPrivate::setGlobalShareContext(glcontext);
13+#else
14 QSGContext::setSharedOpenGLContext(glcontext);
15-#else
16- QOpenGLContextPrivate::setGlobalShareContext(glcontext);
17 #endif
18
19 QString socket;

Subscribers

People subscribed via source and target branches