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
1=== modified file 'common-project-config.pri'
2--- common-project-config.pri 2013-10-04 17:15:49 +0000
3+++ common-project-config.pri 2015-07-13 09:17:51 +0000
4@@ -2,7 +2,6 @@
5 # Common configuration for all projects.
6 #-----------------------------------------------------------------------------
7
8-PKGCONFIG += x11
9 CONFIG += link_pkgconfig
10
11 # we don't like warnings...
12
13=== modified file 'src/request.cpp'
14--- src/request.cpp 2014-04-14 13:21:10 +0000
15+++ src/request.cpp 2015-07-13 09:17:51 +0000
16@@ -47,13 +47,13 @@
17 #include <QVBoxLayout>
18 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
19 #include <QX11Info>
20+#include <X11/Xlib.h>
21 #endif
22 #if HAS_FOREIGN_QWINDOW
23 #include <QWindow>
24 #endif
25 #include <SignOn/uisessiondata.h>
26 #include <SignOn/uisessiondata_priv.h>
27-#include <X11/Xlib.h>
28
29 using namespace SignOnUi;
30 using namespace com::canonical;
31@@ -315,7 +315,7 @@
32 /* We need to use the RemoteRequest implementation in UbuntuTouch,
33 * because displaying of QtWidgets is not working there. This is a
34 * workaround which can be revisited later. */
35- if (QGuiApplication::platformName() != "xcb" ||
36+ if (QGuiApplication::platformName().startsWith("ubuntu") ||
37 qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {
38 return new UbuntuBrowserRequest(connection, message,
39 parameters, parent);
40
41=== modified file 'src/signon-ui.pro'
42--- src/signon-ui.pro 2015-04-09 17:17:05 +0000
43+++ src/signon-ui.pro 2015-07-13 09:17:51 +0000
44@@ -27,7 +27,8 @@
45 lessThan(QT_MAJOR_VERSION, 5) {
46 PKGCONFIG += \
47 accounts-qt \
48- libsignon-qt
49+ libsignon-qt \
50+ x11
51 } else {
52 QT += \
53 webkitwidgets \

Subscribers

People subscribed via source and target branches

to all changes: