aboutsummaryrefslogtreecommitdiffstats
path: root/qbs-resources
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-05-29 13:46:30 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-05-30 08:26:12 +0000
commit1a4456c233b73ab08f7003b0196a30ae408b5c86 (patch)
treecead665513d9a10ea0bd81c0ef9fddca8c502459 /qbs-resources
parent356819a15b2b1de24b3893f7eb4eba6f2a84db09 (diff)
Make "bin" the libexec path on Windows
Otherwise, our binary distributions will not work out of the box, as the process launcher is not in the same place as the libraries. Change-Id: Ied375fa48e5c2cb037d3cb2108296126ee3be4cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs-resources')
-rw-r--r--qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs3
1 files changed, 2 insertions, 1 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 24b655398..0e93f81b4 100644
--- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -9,7 +9,8 @@ Module {
property string appInstallDir: "bin"
property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName
property string importLibInstallDir: libDirName
- property string libexecInstallDir: "libexec/qbs"
+ property string libexecInstallDir: qbs.targetOS.contains("windows") ? appInstallDir
+ : "libexec/qbs"
property bool installHtml: true
property bool installQch: false
property string docInstallDir: "share/doc/qbs/html"