Merge lp://staging/~phablet-team/ubuntu-system-settings/path-fixes into lp://staging/ubuntu-system-settings
Proposed by
Jonas G. Drange
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1727 |
Merged at revision: | 1727 |
Proposed branch: | lp://staging/~phablet-team/ubuntu-system-settings/path-fixes |
Merge into: | lp://staging/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://staging/~phablet-team/ubuntu-system-settings/path-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Approve | |
Ken VanDine | Approve | ||
Lukáš Tinkl (community) | Approve | ||
Alberto Mardegan | Approve | ||
Review via email: mp+306115@code.staging.launchpad.net |
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:/
To post a comment you must log in.
FAILED: Continuous integration, rev:1721 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/155/ /jenkins. canonical. com/system- apps/job/ build/1552/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1552 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1400/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1400 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1400/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1400/console
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: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/155/ rebuild
https:/