Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1447175 into lp:ubuntu-system-settings-online-accounts

  1. lp1447175
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 264
Merged at revision: 276
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1447175
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 169 lines (+17/-31)
8 files modified
debian/control (+1/-3)
online-accounts-service/main.cpp (+6/-6)
online-accounts-service/ui-proxy.cpp (+2/-0)
online-accounts-ui/main.cpp (+2/-18)
online-accounts-ui/online-accounts-ui.pro (+1/-4)
online-accounts-ui/ui-server.cpp (+2/-0)
tests/online-accounts-service/tst_ui_proxy.cpp (+2/-0)
tests/online-accounts-ui/qml/tst_AuthorizationPage.qml (+1/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1447175
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Timo Jyrinki (community) Approve
Review via email: mp+257251@code.launchpad.net

Commit message

Fix build with Qt 5.5

Description of the change

Fix build with Qt 5.5

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19868

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

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

Looking good regarding compiling! I think it's good to land, but I'll file another bug against the failing test:

https://launchpadlibrarian.net/204602520/buildlog_ubuntu-vivid-i386.ubuntu-system-settings-online-accounts_0.6%2B15.04.20150409-0ubuntu2~vivid1~test1~qt550alpha1%2Bfix1_BUILDING.txt.gz

review: Approve
lp:~mardy/ubuntu-system-settings-online-accounts/lp1447175 updated
260. By Alberto Mardegan

from trunk

261. By Alberto Mardegan

Tests: clear signal counter between tests

262. By Alberto Mardegan

Register object before service

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19933

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:262
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/28
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/26/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2461
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2461/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19940

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

review: Needs Fixing (continuous-integration)
lp:~mardy/ubuntu-system-settings-online-accounts/lp1447175 updated
263. By Alberto Mardegan

Share the GL context by using new Qt APIs

264. By Alberto Mardegan

Remove private modules

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2471/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2469/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/209/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/31
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/29/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19954

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looking great with all the bundled fixes! https://launchpad.net/~canonical-qt5-edgers/+archive/ubuntu/qt5-beta2/+sourcepub/4969843/+listing-archive-extra

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19976

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

review: Approve (continuous-integration)

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 2015-04-17 12:04:35 +0000
3+++ debian/control 2015-04-27 21:02:00 +0000
4@@ -13,10 +13,8 @@
5 libsignon-qt5-dev,
6 libsystemsettings-dev (>= 0.1+13.10.20130806),
7 qt5-default,
8- qtbase5-dev,
9- qtbase5-private-dev,
10+ qtbase5-dev (>= 5.4),
11 qtdeclarative5-dev,
12- qtdeclarative5-private-dev,
13 qtdeclarative5-accounts-plugin,
14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-test-plugin,
16
17=== modified file 'online-accounts-service/main.cpp'
18--- online-accounts-service/main.cpp 2015-01-09 16:40:14 +0000
19+++ online-accounts-service/main.cpp 2015-04-27 21:02:00 +0000
20@@ -66,24 +66,24 @@
21
22 Service *service = new Service();
23 QDBusConnection connection = QDBusConnection::sessionBus();
24+ connection.registerObject(OAU_OBJECT_PATH, service);
25 connection.registerService(OAU_SERVICE_NAME);
26- connection.registerObject(OAU_OBJECT_PATH, service);
27
28 SignOnUi::Service *signonuiService = new SignOnUi::Service();
29+ connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
30+ QDBusConnection::ExportAllContents);
31 connection.registerService(SIGNONUI_SERVICE_NAME);
32- connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
33- QDBusConnection::ExportAllContents);
34
35 SignOnUi::IndicatorService *indicatorService =
36 new SignOnUi::IndicatorService();
37- connection.registerService(WEBCREDENTIALS_BUS_NAME);
38 connection.registerObject(WEBCREDENTIALS_OBJECT_PATH,
39 indicatorService->serviceObject());
40+ connection.registerService(WEBCREDENTIALS_BUS_NAME);
41
42 LibaccountsService *libaccountsService = new LibaccountsService();
43+ connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
44+ QDBusConnection::ExportAllContents);
45 connection.registerService(LIBACCOUNTS_BUS_NAME);
46- connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
47- QDBusConnection::ExportAllContents);
48
49 InactivityTimer *inactivityTimer = 0;
50 if (daemonTimeout > 0) {
51
52=== modified file 'online-accounts-service/ui-proxy.cpp'
53--- online-accounts-service/ui-proxy.cpp 2015-02-18 07:37:51 +0000
54+++ online-accounts-service/ui-proxy.cpp 2015-04-27 21:02:00 +0000
55@@ -26,6 +26,8 @@
56
57 #include <Accounts/Manager>
58 #include <Accounts/Provider>
59+#include <QByteArray>
60+#include <QDataStream>
61 #include <QDir>
62 #include <QDomDocument>
63 #include <QDomElement>
64
65=== modified file 'online-accounts-ui/main.cpp'
66--- online-accounts-ui/main.cpp 2015-02-09 13:30:28 +0000
67+++ online-accounts-ui/main.cpp 2015-04-27 21:02:00 +0000
68@@ -1,5 +1,5 @@
69 /*
70- * Copyright (C) 2013-2014 Canonical Ltd.
71+ * Copyright (C) 2013-2015 Canonical Ltd.
72 *
73 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
74 *
75@@ -23,21 +23,16 @@
76 #include "i18n.h"
77 #include "ui-server.h"
78
79-#include <QtGui/QOpenGLContext>
80 #include <QGuiApplication>
81 #include <QLibrary>
82 #include <QProcessEnvironment>
83-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
84-#include <QtQuick/private/qsgcontext_p.h>
85-#else
86-#include <QtGui/private/qopenglcontext_p.h>
87-#endif
88 #include <sys/apparmor.h>
89
90 using namespace OnlineAccountsUi;
91
92 int main(int argc, char **argv)
93 {
94+ QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
95 QGuiApplication app(argc, argv);
96
97 /* The testability driver is only loaded by QApplication but not by
98@@ -73,17 +68,6 @@
99
100 initTr(I18N_DOMAIN, NULL);
101
102- // Enable compositing in oxide
103- QOpenGLContext *glcontext = new QOpenGLContext();
104- glcontext->create();
105-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
106- qt_gl_set_global_share_context(glcontext);
107-#elif QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
108- QOpenGLContextPrivate::setGlobalShareContext(glcontext);
109-#else
110- QSGContext::setSharedOpenGLContext(glcontext);
111-#endif
112-
113 QString socket;
114 QString profile;
115 QStringList arguments = app.arguments();
116
117=== modified file 'online-accounts-ui/online-accounts-ui.pro'
118--- online-accounts-ui/online-accounts-ui.pro 2015-01-05 11:36:05 +0000
119+++ online-accounts-ui/online-accounts-ui.pro 2015-04-27 21:02:00 +0000
120@@ -13,10 +13,7 @@
121 dbus \
122 gui \
123 qml \
124- quick \
125- gui-private \
126- quick-private \
127- core-private
128+ quick
129
130 PKGCONFIG += \
131 accounts-qt5 \
132
133=== modified file 'online-accounts-ui/ui-server.cpp'
134--- online-accounts-ui/ui-server.cpp 2014-11-21 13:50:15 +0000
135+++ online-accounts-ui/ui-server.cpp 2015-04-27 21:02:00 +0000
136@@ -25,6 +25,8 @@
137 #include "ui-server.h"
138
139 #include <OnlineAccountsPlugin/request-handler.h>
140+#include <QByteArray>
141+#include <QDataStream>
142 #include <QLocalSocket>
143 #include <QtQml>
144 #include <SignOn/uisessiondata_priv.h>
145
146=== modified file 'tests/online-accounts-service/tst_ui_proxy.cpp'
147--- tests/online-accounts-service/tst_ui_proxy.cpp 2015-02-16 15:45:27 +0000
148+++ tests/online-accounts-service/tst_ui_proxy.cpp 2015-04-27 21:02:00 +0000
149@@ -23,6 +23,8 @@
150 #include "mock/request-mock.h"
151 #include "ui-proxy.h"
152
153+#include <QByteArray>
154+#include <QDataStream>
155 #include <QDebug>
156 #include <QDBusConnection>
157 #include <QDBusMessage>
158
159=== modified file 'tests/online-accounts-ui/qml/tst_AuthorizationPage.qml'
160--- tests/online-accounts-ui/qml/tst_AuthorizationPage.qml 2014-10-24 18:21:11 +0000
161+++ tests/online-accounts-ui/qml/tst_AuthorizationPage.qml 2015-04-27 21:02:00 +0000
162@@ -53,6 +53,7 @@
163 when: windowShown
164
165 function createAccount(displayName) {
166+ spyAccount.clear()
167 var accountHandle = Manager.createAccount("cool")
168 var account = accountComponent.createObject(null, {
169 "objectHandle": accountHandle

Subscribers

People subscribed via source and target branches