diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-11-01 15:50:15 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-02 15:16:31 +0000 |
commit | 81c92bf00f2e1dad3e319d0bbc5ae466e2a047c6 (patch) | |
tree | 2a0caac96b85f8163c4aa70d41b393e3d4033fcc /qbs-resources | |
parent | e7bb51e497cd5836472f4414d254f560ceab2663 (diff) |
Allow fully overriding the QML type info build and install paths
Amends 6cb626668a
Change-Id: I876f4b72a5d6ee20721b3746861f615e750c9be1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources')
-rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 74613021d..ee28da55a 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.FileInfo Module { property bool enableUnitTests: false @@ -28,5 +29,6 @@ Module { } property string resourcesInstallDir: "" property string pluginsInstallDir: libDirName - property string qmlTypeDescriptionsInstallDir: "share/qbs/qml-type-descriptions" + property string qmlTypeDescriptionsInstallDir: FileInfo.joinPaths(resourcesInstallDir, + "share/qbs/qml-type-descriptions") } |