Merge lp:~mardy/ubuntuone-credentials/loader-1620338 into lp:ubuntuone-credentials

[Alberto Mardegan]

Fix the loader to avoid blank page with Qt 5.6.

Fix account plugin loading

Something must have changed within Loader in Qt 5.6, and the previous code was not working anymore.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:251
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntuone-credentials-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/588
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/594
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/418/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/418
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/418/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntuone-credentials-ci/15/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Don't really understand enough about qml loaders to know if this is a correct fix or not, but if it works, I'd rather get it in and improve things later, for now. So approving.

review: Approve

=== modified file 'online-accounts-provider/Main.qml'
--- online-accounts-provider/Main.qml	2016-03-21 14:48:41 +0000
+++ online-accounts-provider/Main.qml	2016-09-08 09:26:02 +0000
@@ -41,8 +41,7 @@
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
-        source: sourceComponent === null ? (account.accountId != 0 ? existingAccountUrl : newAccountUrl) : ""
-        sourceComponent: account.accountId != 0 ? existingAccountComponent : newAccountComponent
+        source: account.accountId != 0 ? existingAccountUrl : newAccountUrl
 
         Connections {
             target: account