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

[Alberto Mardegan]

Fix build with Qt 5.5

Fix build with Qt 5.5

[PS Jenkins bot (ps-jenkins)]

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)

[Timo Jyrinki (timo-jyrinki)]

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]

260. By Alberto Mardegan on 2015-04-27

from trunk

261. By Alberto Mardegan on 2015-04-27

Tests: clear signal counter between tests

262. By Alberto Mardegan on 2015-04-27

Register object before service

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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]

263. By Alberto Mardegan on 2015-04-27

Share the GL context by using new Qt APIs

264. By Alberto Mardegan on 2015-04-27

Remove private modules

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Timo Jyrinki (timo-jyrinki)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'debian/control'
--- debian/control	2015-04-17 12:04:35 +0000
+++ debian/control	2015-04-27 21:02:00 +0000
@@ -13,10 +13,8 @@
                libsignon-qt5-dev,
                libsystemsettings-dev (>= 0.1+13.10.20130806),
                qt5-default,
-               qtbase5-dev,
-               qtbase5-private-dev,
+               qtbase5-dev (>= 5.4),
                qtdeclarative5-dev,
-               qtdeclarative5-private-dev,
                qtdeclarative5-accounts-plugin,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,

=== modified file 'online-accounts-service/main.cpp'
--- online-accounts-service/main.cpp	2015-01-09 16:40:14 +0000
+++ online-accounts-service/main.cpp	2015-04-27 21:02:00 +0000
@@ -66,24 +66,24 @@
 
     Service *service = new Service();
     QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.registerObject(OAU_OBJECT_PATH, service);
     connection.registerService(OAU_SERVICE_NAME);
-    connection.registerObject(OAU_OBJECT_PATH, service);
 
     SignOnUi::Service *signonuiService = new SignOnUi::Service();
+    connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
+                              QDBusConnection::ExportAllContents);
     connection.registerService(SIGNONUI_SERVICE_NAME);
-    connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
-                              QDBusConnection::ExportAllContents);
 
     SignOnUi::IndicatorService *indicatorService =
         new SignOnUi::IndicatorService();
-    connection.registerService(WEBCREDENTIALS_BUS_NAME);
     connection.registerObject(WEBCREDENTIALS_OBJECT_PATH,
                               indicatorService->serviceObject());
+    connection.registerService(WEBCREDENTIALS_BUS_NAME);
 
     LibaccountsService *libaccountsService = new LibaccountsService();
+    connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
+                              QDBusConnection::ExportAllContents);
     connection.registerService(LIBACCOUNTS_BUS_NAME);
-    connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
-                              QDBusConnection::ExportAllContents);
 
     InactivityTimer *inactivityTimer = 0;
     if (daemonTimeout > 0) {

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2015-02-18 07:37:51 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-04-27 21:02:00 +0000
@@ -26,6 +26,8 @@
 
 #include <Accounts/Manager>
 #include <Accounts/Provider>
+#include <QByteArray>
+#include <QDataStream>
 #include <QDir>
 #include <QDomDocument>
 #include <QDomElement>

=== modified file 'online-accounts-ui/main.cpp'
--- online-accounts-ui/main.cpp	2015-02-09 13:30:28 +0000
+++ online-accounts-ui/main.cpp	2015-04-27 21:02:00 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical Ltd.
+ * Copyright (C) 2013-2015 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -23,21 +23,16 @@
 #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
 #include <sys/apparmor.h>
 
 using namespace OnlineAccountsUi;
 
 int main(int argc, char **argv)
 {
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
     QGuiApplication app(argc, argv);
 
     /* The testability driver is only loaded by QApplication but not by
@@ -73,17 +68,6 @@
 
     initTr(I18N_DOMAIN, NULL);
 
-    // Enable compositing in oxide
-    QOpenGLContext *glcontext = new QOpenGLContext();
-    glcontext->create();
-#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);
-#endif
-
     QString socket;
     QString profile;
     QStringList arguments = app.arguments();

=== modified file 'online-accounts-ui/online-accounts-ui.pro'
--- online-accounts-ui/online-accounts-ui.pro	2015-01-05 11:36:05 +0000
+++ online-accounts-ui/online-accounts-ui.pro	2015-04-27 21:02:00 +0000
@@ -13,10 +13,7 @@
     dbus \
     gui \
     qml \
-    quick \
-    gui-private \
-    quick-private \
-    core-private
+    quick
 
 PKGCONFIG += \
     accounts-qt5 \

=== modified file 'online-accounts-ui/ui-server.cpp'
--- online-accounts-ui/ui-server.cpp	2014-11-21 13:50:15 +0000
+++ online-accounts-ui/ui-server.cpp	2015-04-27 21:02:00 +0000
@@ -25,6 +25,8 @@
 #include "ui-server.h"
 
 #include <OnlineAccountsPlugin/request-handler.h>
+#include <QByteArray>
+#include <QDataStream>
 #include <QLocalSocket>
 #include <QtQml>
 #include <SignOn/uisessiondata_priv.h>

=== modified file 'tests/online-accounts-service/tst_ui_proxy.cpp'
--- tests/online-accounts-service/tst_ui_proxy.cpp	2015-02-16 15:45:27 +0000
+++ tests/online-accounts-service/tst_ui_proxy.cpp	2015-04-27 21:02:00 +0000
@@ -23,6 +23,8 @@
 #include "mock/request-mock.h"
 #include "ui-proxy.h"
 
+#include <QByteArray>
+#include <QDataStream>
 #include <QDebug>
 #include <QDBusConnection>
 #include <QDBusMessage>

=== modified file 'tests/online-accounts-ui/qml/tst_AuthorizationPage.qml'
--- tests/online-accounts-ui/qml/tst_AuthorizationPage.qml	2014-10-24 18:21:11 +0000
+++ tests/online-accounts-ui/qml/tst_AuthorizationPage.qml	2015-04-27 21:02:00 +0000
@@ -53,6 +53,7 @@
         when: windowShown
 
         function createAccount(displayName) {
+            spyAccount.clear()
             var accountHandle = Manager.createAccount("cool")
             var account = accountComponent.createObject(null, {
                 "objectHandle": accountHandle