Merge lp:~mardy/signon-ui/lp1473422 into lp:signon-ui

[Alberto Mardegan]

Fix portability to non-X11 platforms

A couple of issues affecting non-X11 platforms (e.g., wayland):
- Invert the logic of using oxide: explicitly use it under Mir,
  instead of using it in any non X11 platform.
- Don't link to unnecessary X11 libs when building for Qt5.

Fix portability to non-X11 platforms

A couple of issues affecting non-X11 platforms (e.g., wayland):
- Invert the logic of using oxide: explicitly use it under Mir,
  instead of using it in any non X11 platform.
- Don't link to unnecessary X11 libs when building for Qt5.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-ui-wily-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/signon-ui-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-ui-wily-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ui-ci/64/rebuild

review: Needs Fixing (continuous-integration)

[David Barth (dbarth)]

lgtm

review: Approve

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2013-10-04 17:15:49 +0000
+++ common-project-config.pri	2015-07-13 09:17:51 +0000
@@ -2,7 +2,6 @@
 # Common configuration for all projects.
 #-----------------------------------------------------------------------------
 
-PKGCONFIG      += x11
 CONFIG         += link_pkgconfig
 
 # we don't like warnings...

=== modified file 'src/request.cpp'
--- src/request.cpp	2014-04-14 13:21:10 +0000
+++ src/request.cpp	2015-07-13 09:17:51 +0000
@@ -47,13 +47,13 @@
 #include <QVBoxLayout>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QX11Info>
+#include <X11/Xlib.h>
 #endif
 #if HAS_FOREIGN_QWINDOW
 #include <QWindow>
 #endif
 #include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
-#include <X11/Xlib.h>
 
 using namespace SignOnUi;
 using namespace com::canonical;
@@ -315,7 +315,7 @@
         /* We need to use the RemoteRequest implementation in UbuntuTouch,
          * because displaying of QtWidgets is not working there. This is a
          * workaround which can be revisited later. */
-        if (QGuiApplication::platformName() != "xcb" ||
+        if (QGuiApplication::platformName().startsWith("ubuntu") ||
             qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {
             return new UbuntuBrowserRequest(connection, message,
                                             parameters, parent);

=== modified file 'src/signon-ui.pro'
--- src/signon-ui.pro	2015-04-09 17:17:05 +0000
+++ src/signon-ui.pro	2015-07-13 09:17:51 +0000
@@ -27,7 +27,8 @@
 lessThan(QT_MAJOR_VERSION, 5) {
     PKGCONFIG += \
         accounts-qt \
-        libsignon-qt
+        libsignon-qt \
+        x11
 } else {
     QT += \
         webkitwidgets \