From 81c92bf00f2e1dad3e319d0bbc5ae466e2a047c6 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Wed, 1 Nov 2017 15:50:15 -0700
Subject: Allow fully overriding the QML type info build and install paths

Amends 6cb626668a

Change-Id: I876f4b72a5d6ee20721b3746861f615e750c9be1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'qbs-resources')

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")
 }
-- 
cgit v1.2.3