Merge lp:~phablet-team/ubuntu-system-settings/path-fixes into lp:ubuntu-system-settings
| Status: | Merged |
|---|---|
| Approved by: | Ken VanDine on 2016-09-30 |
| Approved revision: | 1727 |
| Merged at revision: | 1727 |
| Proposed branch: | lp:~phablet-team/ubuntu-system-settings/path-fixes |
| Merge into: | lp:ubuntu-system-settings |
| Diff against target: |
574 lines (+141/-48) 17 files modified
CMakeLists.txt (+17/-4) plugins/about/storageabout.cpp (+13/-3) plugins/background/background.cpp (+6/-6) plugins/background/background.h (+1/-1) plugins/language/language-plugin.cpp (+17/-9) plugins/language/onscreenkeyboard-plugin.cpp (+10/-2) plugins/security-privacy/securityprivacy.cpp (+3/-1) plugins/security-privacy/trust-store-model.cpp (+5/-1) plugins/sound/PageComponent.qml (+2/-2) plugins/sound/SoundsList.qml (+3/-2) plugins/sound/sound.cpp (+10/-0) src/CMakeLists.txt (+2/-0) src/main.cpp (+7/-3) src/plugin-manager.cpp (+14/-3) src/plugin.cpp (+13/-4) src/utils.cpp (+12/-5) tests/CMakeLists.txt (+6/-2) |
| To merge this branch: | bzr merge lp:~phablet-team/ubuntu-system-settings/path-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Approve on 2016-09-30 | |
| Ken VanDine | 2016-09-19 | Approve on 2016-09-30 | |
| Lukáš Tinkl (community) | Approve on 2016-09-23 | ||
| Alberto Mardegan | Approve on 2016-09-23 | ||
|
Review via email:
|
|||
Commit Message
uses XDG_DATA_DIRS where applicable to enable USS to find files and folders on snappy-based systems
Description of the Change
Rewrites code that reference hard coded paths (e.g. /usr/share/foo) to use QStandardPaths. Some paths, e.g. to /etc, are still hard coded, but I've prepended $SNAP, which should be empty ("") on traditional non-snappy systems.
Packaging changes are deps that were missing.
Note: I have left the background panel mostly alone, due to [1]. I've also left the Updates panel alone—it will never be expected to work as it is now, on snappy.
[1] https:/
PASSED: Continuous integration, rev:1721
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1724. By Jonas G. Drange on 2016-09-23
-
address comments from ltinkl
- 1725. By Jonas G. Drange on 2016-09-23
-
do sub in one go
FAILED: Continuous integration, rev:1723
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1723
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1725
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1725
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1725
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1726. By Jonas G. Drange on 2016-09-26
-
merge Bileto Bot 2016-09-16 Releasing 0.4+16.
10.20160916- 0ubuntu1
PASSED: Continuous integration, rev:1726
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Ken VanDine (ken-vandine) wrote : | # |
I left an inline comment.
Also I noticed defaultBackgrou
- 1727. By Jonas G. Drange on 2016-09-30
-
prepend SNAP to default wallpaper, and drop unused declarations
PASSED: Continuous integration, rev:1727
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1721
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/