ubuntu-system-settings

Merge lp:~laney/ubuntu-system-settings/fix-linkage into lp:ubuntu-system-settings

  1. fix-linkage
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Charles Kerr
Approved revision: 474
Merged at revision: 474
Proposed branch: lp:~laney/ubuntu-system-settings/fix-linkage
Merge into: lp:ubuntu-system-settings
Diff against target: 45 lines (+1/-5)
3 files modified
plugins/bluetooth/bluetooth.h (+0/-3)
plugins/bluetooth/devicemodel.h (+0/-1)
plugins/language/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~laney/ubuntu-system-settings/fix-linkage
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+192543@code.launchpad.net

Commit message

Fix dh_shlibdeps warnings. Don't define prototype for functions that aren't implemented. Link the language C++ plugin with gio.

Description of the change

I noticed that dh_shlibdeps was complaining about unresolvable references. This turned out to be because the language plugin wasn't linking against gio (new with cmake) and the bluetooth plugin had in its headers prototypes that were never defined. Fix both.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/489/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/5

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/489/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good to me. Thanks for the fix :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/bluetooth.h'
2--- plugins/bluetooth/bluetooth.h 2013-10-10 21:41:36 +0000
3+++ plugins/bluetooth/bluetooth.h 2013-10-24 17:02:53 +0000
4@@ -56,7 +56,6 @@
5
6 private Q_SLOTS:
7 void onPairingDone();
8- void slotDevicePairedChanged();
9
10 public:
11 Bluetooth(QObject *parent = 0);
12@@ -65,8 +64,6 @@
13 Q_INVOKABLE void setSelectedDevice(const QString &address);
14 Q_INVOKABLE void connectHeadset(const QString &address);
15 Q_INVOKABLE void disconnectHeadset();
16- Q_INVOKABLE void connectAudioSource();
17- Q_INVOKABLE void disconnectAudioSource();
18
19 public:
20 Agent * getAgent();
21
22=== modified file 'plugins/bluetooth/devicemodel.h'
23--- plugins/bluetooth/devicemodel.h 2013-10-10 21:41:36 +0000
24+++ plugins/bluetooth/devicemodel.h 2013-10-24 17:02:53 +0000
25@@ -100,7 +100,6 @@
26 void slotDeviceFound(const QString &, const QMap<QString,QVariant>&);
27 void slotDeviceDisappeared(const QString&);
28 void slotDefaultAdapterChanged(const QDBusObjectPath&);
29- void slotManagerPropertyChanged(const QString&, const QVariant&);
30 void slotAdapterRemoved(const QDBusObjectPath& path);
31 };
32
33
34=== modified file 'plugins/language/CMakeLists.txt'
35--- plugins/language/CMakeLists.txt 2013-10-22 14:44:44 +0000
36+++ plugins/language/CMakeLists.txt 2013-10-24 17:02:53 +0000
37@@ -15,7 +15,7 @@
38 keyboard-layout.h language-plugin.h plugin.h subset-model.h
39 ${QML_SOURCES})
40 qt5_use_modules(UbuntuLanguagePlugin Qml Quick DBus XmlPatterns)
41-target_link_libraries(UbuntuLanguagePlugin ${GLIB_LDFLAGS} ${ACCOUNTSSERVICE_LDFLAGS})
42+target_link_libraries(UbuntuLanguagePlugin ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${ACCOUNTSSERVICE_LDFLAGS})
43
44 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/LanguagePlugin)
45 install(TARGETS UbuntuLanguagePlugin DESTINATION ${PLUG_DIR})

Subscribers

People subscribed via source and target branches