ubuntu-system-settings

Merge lp://qastaging/~mardy/ubuntu-system-settings/proto into lp://qastaging/ubuntu-system-settings

  1. proto
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Ken VanDine
Approved revision: 23
Merged at revision: 23
Proposed branch: lp://qastaging/~mardy/ubuntu-system-settings/proto
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 3263 lines (+2947/-0)
61 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+7/-0)
COPYING (+674/-0)
INSTALL (+4/-0)
README (+1/-0)
common-installs-config.pri (+47/-0)
common-project-config.pri (+32/-0)
common-vars.pri (+19/-0)
coverage.pri (+49/-0)
debian/changelog (+9/-0)
debian/compat (+1/-0)
debian/control (+54/-0)
debian/copyright (+10/-0)
debian/libsystemsettings-dev.install (+2/-0)
debian/libsystemsettings1.install (+1/-0)
debian/rules (+11/-0)
debian/ubuntu-system-settings-example.install (+2/-0)
debian/ubuntu-system-settings.install (+1/-0)
lib/SystemSettings/ItemBase (+1/-0)
lib/SystemSettings/PluginInterface (+1/-0)
lib/SystemSettings/SystemSettings.pro (+38/-0)
lib/SystemSettings/debug.cpp (+29/-0)
lib/SystemSettings/debug.h (+33/-0)
lib/SystemSettings/item-base.cpp (+134/-0)
lib/SystemSettings/item-base.h (+76/-0)
lib/SystemSettings/plugin-interface.h (+43/-0)
lib/lib.pro (+4/-0)
plugins/example/PageComponent.qml (+44/-0)
plugins/example/example-plugin.cpp (+68/-0)
plugins/example/example-plugin.h (+40/-0)
plugins/example/example.pro (+40/-0)
plugins/example/example.settings (+14/-0)
plugins/example/ui.qrc (+5/-0)
plugins/plugins.pro (+3/-0)
po/Makefile (+31/-0)
po/update_pot.sh (+5/-0)
src/debug.cpp (+29/-0)
src/debug.h (+48/-0)
src/i18n.cpp (+40/-0)
src/i18n.h (+34/-0)
src/item-model.cpp (+139/-0)
src/item-model.h (+60/-0)
src/main.cpp (+57/-0)
src/plugin-manager.cpp (+133/-0)
src/plugin-manager.h (+60/-0)
src/plugin.cpp (+212/-0)
src/plugin.h (+66/-0)
src/qml/EntryComponent.qml (+41/-0)
src/qml/MainWindow.qml (+66/-0)
src/src.pro (+60/-0)
src/ui.qrc (+6/-0)
system-settings.pro (+17/-0)
tests/data/bluetooth.settings (+12/-0)
tests/data/cellular.settings (+15/-0)
tests/data/wireless.settings (+14/-0)
tests/plugin.pro (+28/-0)
tests/test-plugin.cpp (+86/-0)
tests/test-plugin.h (+40/-0)
tests/tests.pro (+5/-0)
tests/tst_plugins.cpp (+100/-0)
tests/tst_plugins.pro (+44/-0)
To merge this branch: bzr merge lp://qastaging/~mardy/ubuntu-system-settings/proto
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+164195@code.qastaging.launchpad.net

Commit message

Initial implementation of a plugin system.

Description of the change

Initial implementation of a plugin system.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I'm still reviewing this, but I went ahead and proposed a branch to merge into this before we merge this to trunk that fixes up the packaging a bit. Most important part of that is debian/copyright, I wanted it to be accurate before we merged it.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Should libSystemSettings be a public library? It is currently installed in libdir, I would expect it to only be used in ubuntu-system-settings, and plugins would need to run inside our container.

review: Needs Information
Revision history for this message
Alberto Mardegan (mardy) wrote :

> Should libSystemSettings be a public library? It is currently installed in
> libdir, I would expect it to only be used in ubuntu-system-settings, and
> plugins would need to run inside our container.

Good point! Indeed, it doesn't need to be there. What would you suggest, then? Maybe /usr/lib/system-settings/, where also the plugins are installed?

lp://qastaging/~mardy/ubuntu-system-settings/proto updated
18. By Alberto Mardegan

packaging cleanup

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Yeah, I think putting it in the same directory as the plugins would be best.

lp://qastaging/~mardy/ubuntu-system-settings/proto updated
19. By Alberto Mardegan

Install libSystemSettings in /usr/lib/system-settings/

Revision history for this message
Ken VanDine (ken-vandine) wrote :

The RPATH is getting set to a directory inside the build directory. In this case QMAKE_RPATHDIR is unnecessary.

review: Needs Fixing
lp://qastaging/~mardy/ubuntu-system-settings/proto updated
20. By Alberto Mardegan

Remove usage of QMAKE_RPATHDIR

21. By Alberto Mardegan

Add rpath to /usr/lib/system-settings/

22. By Alberto Mardegan

Move libSystemSettings back to /usr/lib, remove unnecessary rpaths

Revision history for this message
Ken VanDine (ken-vandine) wrote :

I'm happy with the RPATH fixes, we need to split the package up then we can get this approved. I've proposed a branch for that.

lp://qastaging/~mardy/ubuntu-system-settings/proto updated
23. By Alberto Mardegan

Split package up into application, plugin and libs

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Excellent

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches