summaryrefslogtreecommitdiff
path: root/qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-10-28 16:06:00 +0100
committerEike Ziller <eike.ziller@qt.io>2019-11-05 12:31:40 +0000
commit48432161926332a15efa3479c6cad73d825aaddb (patch)
treec1e89d8849f9f195d551bcc789ff5543dbc9a213 /qbs
parent5634f112bd31cd2f9ccc521072097a22fb6f09c7 (diff)
downloadqt-creator-48432161926332a15efa3479c6cad73d825aaddb.tar.gz
macOS: Fix execution of helper executables with UI
The qt.conf that is written into the Resources/ folder is used for the main Qt Creator executable, so that cannot be used for the helper executables. Move the executables one more level down and add a separate qt.conf for them. Fixes: QTCREATORBUG-23120 Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/qtc/qtc.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index d41a98f562..3c6c30f8c7 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -48,7 +48,7 @@ Module {
? ide_app_target + ".app/Contents/Resources"
: "share/qtcreator"
property string ide_libexec_path: qbs.targetOS.contains("macos")
- ? ide_data_path : qbs.targetOS.contains("windows")
+ ? ide_data_path + "/libexec" : qbs.targetOS.contains("windows")
? ide_app_path
: "libexec/qtcreator"
property string ide_bin_path: qbs.targetOS.contains("macos")