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

[Timo Jyrinki]

Use qt_gl_set_global_share_context with Qt 5.4 (LP: #1398372)

[lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/fix_qt54_buildfail_new_function]

229. By Timo Jyrinki on 2015-02-09

Correct parameter.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17880

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/196/rebuild

review: Approve (continuous-integration)

=== modified file 'online-accounts-ui/main.cpp'
--- online-accounts-ui/main.cpp	2015-01-13 09:11:02 +0000
+++ online-accounts-ui/main.cpp	2015-02-09 13:30:41 +0000
@@ -76,10 +76,12 @@
     // Enable compositing in oxide
     QOpenGLContext *glcontext = new QOpenGLContext();
     glcontext->create();
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    qt_gl_set_global_share_context(glcontext);
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
+    QOpenGLContextPrivate::setGlobalShareContext(glcontext);
+#else
     QSGContext::setSharedOpenGLContext(glcontext);
-#else
-    QOpenGLContextPrivate::setGlobalShareContext(glcontext);
 #endif
 
     QString socket;