Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/snapd-paths2 into lp://qastaging/ubuntu-system-settings
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-system-settings/snapd-paths2 |
| Merge into: | lp://qastaging/ubuntu-system-settings |
| Diff against target: |
585 lines (+157/-47) 18 files modified
CMakeLists.txt (+9/-5) plugins/about/storageabout.cpp (+13/-3) plugins/background/MainPage.qml (+3/-4) plugins/background/background.cpp (+13/-1) plugins/background/background.h (+8/-0) 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 (+20/-4) src/utils.cpp (+12/-5) tests/CMakeLists.txt (+6/-2) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/snapd-paths2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Mardegan | Needs Fixing | ||
|
Review via email:
|
|||
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:/
Unmerged revisions
- 1722. By Jonas G. Drange
-
more cleanup
- 1721. By Jonas G. Drange
-
clean up diff
- 1720. By Jonas G. Drange
-
add comment, fix one piece of whitespace
- 1719. By Jonas G. Drange
-
more nuking of usr in trust store, osk plugin and sound plugin
- 1718. By Jonas G. Drange
-
migrate more paths to work on a snappy system
- 1717. By Jonas G. Drange
-
use data dir in settings dir
- 1716. By Jonas G. Drange
-
address comments from mardy
- 1715. By Jonas G. Drange
-
search xdg paths for qml and .settings files
- 1714. By Jonas G. Drange
-
use ctx prop for mountpoint
- 1713. By Jonas G. Drange
-
use xdg dirs for usr share stuff
Nothing major, but please see the inline comments.