qtubuntu-sensors

Merge lp:~sil2100/qtubuntu-sensors/lib_private into lp:qtubuntu-sensors

  1. lib_private
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Ken VanDine
Approved revision: 37
Merged at revision: 36
Proposed branch: lp:~sil2100/qtubuntu-sensors/lib_private
Merge into: lp:qtubuntu-sensors
Diff against target: 20 lines (+3/-1)
2 files modified
lib/lib.pro (+1/-1)
plugin/plugin.pro (+2/-0)
To merge this branch: bzr merge lp:~sil2100/qtubuntu-sensors/lib_private
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+175331@code.launchpad.net

Commit message

Turn libqtubuntu_sensors.so into a private library

Description of the change

Turn libqtubuntu_sensors.so into a private library

This needs discussion. The lib CONFIG is used for this library, but I changed the path to a private directory. For it to work, I set the RPATH of the sensor library to the new private lib directory.
Whaddayathink?

To post a comment you must log in.
lp:~sil2100/qtubuntu-sensors/lib_private updated
37. By Łukasz Zemczak

Eh, ubuntu-1 is invalid

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

Looks great, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-sensors-ci/11/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lib.pro'
2--- lib/lib.pro 2013-01-23 20:26:32 +0000
3+++ lib/lib.pro 2013-07-17 16:56:23 +0000
4@@ -12,5 +12,5 @@
5 SOURCES += orientationsensor.cpp \
6 accelerometersensor.cpp
7
8-target.path = $$[QT_INSTALL_LIBS]
9+target.path = $$[QT_INSTALL_LIBS]/qtubuntu-sensors
10 INSTALLS += target
11
12=== modified file 'plugin/plugin.pro'
13--- plugin/plugin.pro 2013-02-06 22:42:40 +0000
14+++ plugin/plugin.pro 2013-07-17 16:56:23 +0000
15@@ -28,3 +28,5 @@
16 INSTALLS += target
17
18 OTHER_FILES += plugin.json
19+
20+QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]/qtubuntu-sensors

Subscribers

People subscribed via source and target branches