Online Accounts setup for Ubuntu Touch

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

  1. use-hw-compositiing-oxide-rtm-1409
  2. Merge into rtm-14.09
Proposed by Alexandre Abreu
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 200
Merged at revision: 200
Proposed branch: lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/use-hw-compositiing-oxide-rtm-1409
Merge into: lp:ubuntu-system-settings-online-accounts/rtm-14.09
Diff against target: 65 lines (+21/-1)
3 files modified
debian/control (+2/-0)
online-accounts-ui/main.cpp (+15/-0)
online-accounts-ui/online-accounts-ui.pro (+4/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/ubuntu-system-settings-online-accounts/use-hw-compositiing-oxide-rtm-1409
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
David Barth (community) Approve
Review via email: mp+239999@code.launchpad.net

Commit message

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

Description of the change

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

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

Thanks!

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-08 07:12:09 +0000
3+++ debian/control 2014-10-29 14:18:07 +0000
4@@ -13,7 +13,9 @@
5 libsystemsettings-dev (>= 0.1+13.10.20130806),
6 qt5-default,
7 qtbase5-dev,
8+ qtbase5-private-dev,
9 qtdeclarative5-dev,
10+ qtdeclarative5-private-dev,
11 qtdeclarative5-accounts-plugin,
12 qtdeclarative5-qtquick2-plugin,
13 qtdeclarative5-test-plugin,
14
15=== modified file 'online-accounts-ui/main.cpp'
16--- online-accounts-ui/main.cpp 2014-08-07 13:41:03 +0000
17+++ online-accounts-ui/main.cpp 2014-10-29 14:18:07 +0000
18@@ -23,9 +23,15 @@
19 #include "i18n.h"
20 #include "ui-server.h"
21
22+#include <QtGui/QOpenGLContext>
23 #include <QGuiApplication>
24 #include <QLibrary>
25 #include <QProcessEnvironment>
26+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
27+#include <QtQuick/private/qsgcontext_p.h>
28+#else
29+#include <QtGui/private/qopenglcontext_p.h>
30+#endif
31
32 using namespace OnlineAccountsUi;
33
34@@ -66,6 +72,15 @@
35
36 initTr(I18N_DOMAIN, NULL);
37
38+ // Enable compositing in oxide
39+ QOpenGLContext *glcontext = new QOpenGLContext();
40+ glcontext->create();
41+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
42+ QSGContext::setSharedOpenGLContext(glcontext);
43+#else
44+ QOpenGLContextPrivate::setGlobalShareContext(glcontext);
45+#endif
46+
47 QStringList arguments = app.arguments();
48 int i = arguments.indexOf("--socket");
49 if (i < 0 || i + 1 >= arguments.count()) {
50
51=== modified file 'online-accounts-ui/online-accounts-ui.pro'
52--- online-accounts-ui/online-accounts-ui.pro 2014-10-09 12:24:45 +0000
53+++ online-accounts-ui/online-accounts-ui.pro 2014-10-29 14:18:07 +0000
54@@ -13,7 +13,10 @@
55 dbus \
56 gui \
57 qml \
58- quick
59+ quick \
60+ gui-private \
61+ quick-private \
62+ core-private
63
64 PKGCONFIG += \
65 accounts-qt5 \

Subscribers

People subscribed via source and target branches