Merge lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/use-hw-compositiing-oxide-rtm-1409 into lp:ubuntu-system-settings-online-accounts/rtm-14.09

[Alexandre Abreu]

RTM14.09 backport of the fix for Bug #1377181: Account creation fails repeatedly, then it works

RTM14.09 backport of the fix for Bug #1377181: Account creation fails repeatedly, then it works

[David Barth (dbarth)]

review: Approve

[Alberto Mardegan (mardy)]

Thanks!

review: Approve

[Timo Jyrinki (timo-jyrinki)]

I grudgingly approve this since it fixes a critical bug, but I've filed bug #1387537

=== modified file 'debian/control'
--- debian/control	2014-10-08 07:12:09 +0000
+++ debian/control	2014-10-29 14:18:07 +0000
@@ -13,7 +13,9 @@
                libsystemsettings-dev (>= 0.1+13.10.20130806),
                qt5-default,
                qtbase5-dev,
+               qtbase5-private-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-private-dev,
                qtdeclarative5-accounts-plugin,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
 
=== modified file 'online-accounts-ui/main.cpp'
--- online-accounts-ui/main.cpp	2014-08-07 13:41:03 +0000
+++ online-accounts-ui/main.cpp	2014-10-29 14:18:07 +0000
@@ -23,9 +23,15 @@
 #include "i18n.h"
 #include "ui-server.h"
 
+#include <QtGui/QOpenGLContext>
 #include <QGuiApplication>
 #include <QLibrary>
 #include <QProcessEnvironment>
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+#include <QtQuick/private/qsgcontext_p.h>
+#else
+#include <QtGui/private/qopenglcontext_p.h>
+#endif
 
 using namespace OnlineAccountsUi;
 
@@ -66,6 +72,15 @@
 
     initTr(I18N_DOMAIN, NULL);
 
+    // Enable compositing in oxide
+    QOpenGLContext *glcontext = new QOpenGLContext();
+    glcontext->create();
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+    QSGContext::setSharedOpenGLContext(glcontext);
+#else
+    QOpenGLContextPrivate::setGlobalShareContext(glcontext);
+#endif
+
     QStringList arguments = app.arguments();
     int i = arguments.indexOf("--socket");
     if (i < 0 || i + 1 >= arguments.count()) {
 
=== modified file 'online-accounts-ui/online-accounts-ui.pro'
--- online-accounts-ui/online-accounts-ui.pro	2014-10-09 12:24:45 +0000
+++ online-accounts-ui/online-accounts-ui.pro	2014-10-29 14:18:07 +0000
@@ -13,7 +13,10 @@
     dbus \
     gui \
     qml \
-    quick
+    quick \
+    gui-private \
+    quick-private \
+    core-private
 
 PKGCONFIG += \
     accounts-qt5 \