diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-28 16:06:00 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-05 12:31:40 +0000 |
| commit | 48432161926332a15efa3479c6cad73d825aaddb (patch) | |
| tree | c1e89d8849f9f195d551bcc789ff5543dbc9a213 /dist | |
| parent | 5634f112bd31cd2f9ccc521072097a22fb6f09c7 (diff) | |
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 'dist')
| -rw-r--r-- | dist/installer/mac/ios_qt.conf | 2 | ||||
| -rw-r--r-- | dist/installer/mac/libexec_qt.conf | 5 | ||||
| -rw-r--r-- | dist/installer/mac/qmldesigner_qt.conf | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/dist/installer/mac/ios_qt.conf b/dist/installer/mac/ios_qt.conf index 9e239d6193..249df1d74c 100644 --- a/dist/installer/mac/ios_qt.conf +++ b/dist/installer/mac/ios_qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = ../../PlugIns +Plugins = ../../../PlugIns diff --git a/dist/installer/mac/libexec_qt.conf b/dist/installer/mac/libexec_qt.conf new file mode 100644 index 0000000000..7004d4bec3 --- /dev/null +++ b/dist/installer/mac/libexec_qt.conf @@ -0,0 +1,5 @@ +[Paths] +Prefix = ../.. +Imports = Imports/qtquick1 +Qml2Imports = Imports/qtquick2 +Plugins = PlugIns diff --git a/dist/installer/mac/qmldesigner_qt.conf b/dist/installer/mac/qmldesigner_qt.conf index c10c195bdd..8d80be2292 100644 --- a/dist/installer/mac/qmldesigner_qt.conf +++ b/dist/installer/mac/qmldesigner_qt.conf @@ -1,4 +1,5 @@ [Paths] -Imports = ../../Imports/qtquick1 -Qml2Imports = ../../Imports/qtquick2 -Plugins = ../../PlugIns +Prefix = ../../.. +Imports = Imports/qtquick1 +Qml2Imports = Imports/qtquick2 +Plugins = PlugIns |