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

Proposed by Alberto Mardegan on 2015-07-13
Status: Merged
Approved by: David Barth on 2015-08-04
Approved revision: 140
Merged at revision: 140
Proposed branch: lp:~mardy/signon-ui/lp1473422
Merge into: lp:signon-ui
Diff against target: 53 lines (+4/-4)
3 files modified
common-project-config.pri (+0/-1)
src/request.cpp (+2/-2)
src/signon-ui.pro (+2/-1)
To merge this branch: bzr merge lp:~mardy/signon-ui/lp1473422
Reviewer Review Type Date Requested Status
David Barth (community) 2015-07-13 Approve on 2015-07-23
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-07-13
Review via email: mp+264525@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2# Common configuration for all projects.2# Common configuration for all projects.
3#-----------------------------------------------------------------------------3#-----------------------------------------------------------------------------
44
5PKGCONFIG += x11
6CONFIG += link_pkgconfig5CONFIG += link_pkgconfig
76
8# we don't like warnings...7# we don't like warnings...
98
=== 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 @@
47#include <QVBoxLayout>47#include <QVBoxLayout>
48#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)48#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
49#include <QX11Info>49#include <QX11Info>
50#include <X11/Xlib.h>
50#endif51#endif
51#if HAS_FOREIGN_QWINDOW52#if HAS_FOREIGN_QWINDOW
52#include <QWindow>53#include <QWindow>
53#endif54#endif
54#include <SignOn/uisessiondata.h>55#include <SignOn/uisessiondata.h>
55#include <SignOn/uisessiondata_priv.h>56#include <SignOn/uisessiondata_priv.h>
56#include <X11/Xlib.h>
5757
58using namespace SignOnUi;58using namespace SignOnUi;
59using namespace com::canonical;59using namespace com::canonical;
@@ -315,7 +315,7 @@
315 /* We need to use the RemoteRequest implementation in UbuntuTouch,315 /* We need to use the RemoteRequest implementation in UbuntuTouch,
316 * because displaying of QtWidgets is not working there. This is a316 * because displaying of QtWidgets is not working there. This is a
317 * workaround which can be revisited later. */317 * workaround which can be revisited later. */
318 if (QGuiApplication::platformName() != "xcb" ||318 if (QGuiApplication::platformName().startsWith("ubuntu") ||
319 qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {319 qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {
320 return new UbuntuBrowserRequest(connection, message,320 return new UbuntuBrowserRequest(connection, message,
321 parameters, parent);321 parameters, parent);
322322
=== 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 @@
27lessThan(QT_MAJOR_VERSION, 5) {27lessThan(QT_MAJOR_VERSION, 5) {
28 PKGCONFIG += \28 PKGCONFIG += \
29 accounts-qt \29 accounts-qt \
30 libsignon-qt30 libsignon-qt \
31 x11
31} else {32} else {
32 QT += \33 QT += \
33 webkitwidgets \34 webkitwidgets \

Subscribers

People subscribed via source and target branches

to all changes: