Online Accounts setup for Ubuntu Touch

Merge lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/qt54 into lp:ubuntu-system-settings-online-accounts

  1. qt54
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 216
Merge reported by: Alberto Mardegan
Merged at revision: not available
Proposed branch: lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/qt54
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 15 lines (+3/-1)
1 file modified
online-accounts-ui/main.cpp (+3/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/qt54
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
Review via email: mp+244443@code.launchpad.net

Commit message

Fix qt 5.4 compilation w/ new qt ogl api.

Description of the change

Fix qt 5.4 compilation w/ new qt ogl api.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
Alberto Mardegan (mardy) wrote :

This has already been fixed in trunk in another MP.

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 2014-10-29 13:12:15 +0000
3+++ online-accounts-ui/main.cpp 2014-12-11 14:34:39 +0000
4@@ -77,8 +77,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 QStringList arguments = app.arguments();

Subscribers

People subscribed via source and target branches