Merge lp://staging/~mardy/signon-ui/lp1473422 into lp://staging/signon-ui
Proposed by
Alberto Mardegan
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | David Barth | ||||||||
| Approved revision: | 140 | ||||||||
| Merged at revision: | 140 | ||||||||
| Proposed branch: | lp://staging/~mardy/signon-ui/lp1473422 | ||||||||
| Merge into: | lp://staging/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://staging/~mardy/signon-ui/lp1473422 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Barth (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
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.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:140
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://