Merge lp:~ken-vandine/gsettings-qt/versioned_dir into lp:gsettings-qt

Proposed by Ken VanDine
Status: Merged
Approved by: Lars Karlitski
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~ken-vandine/gsettings-qt/versioned_dir
Merge into: lp:gsettings-qt
Diff against target: 14 lines (+2/-1)
1 file modified
GSettings/gsettings-qt.pro (+2/-1)
To merge this branch: bzr merge lp:~ken-vandine/gsettings-qt/versioned_dir
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+178755@code.launchpad.net

Commit message

Install QML module in a versioned dir so it is really parallel installable

Description of the change

Install QML module in a versioned dir so it is really parallel installable

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

+1

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GSettings/gsettings-qt.pro'
2--- GSettings/gsettings-qt.pro 2013-07-30 15:24:16 +0000
3+++ GSettings/gsettings-qt.pro 2013-08-06 13:35:34 +0000
4@@ -12,9 +12,10 @@
5 SOURCES = plugin.cpp gsettings-qml.cpp
6
7 uri = GSettings
8+API_VER = 1.0
9
10 # deployment rules for the plugin
11-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
12+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /).$$API_VER
13 target.path = $$installPath
14 INSTALLS += target
15

Subscribers

People subscribed via source and target branches

to all changes: