diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-19 12:34:24 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-19 15:07:36 +0000 |
| commit | 7fa6d5194260540de6f632fb93af5a2ba1e505c8 (patch) | |
| tree | f5a6e37465298a4e029cd1a9e1d3fcd649d4f669 /dist/installer | |
| parent | 51ed0da5a97b562ee2fe664bc3d4316f7ee65385 (diff) | |
| download | qt-creator-7fa6d5194260540de6f632fb93af5a2ba1e505c8.tar.gz | |
Fix deployment of qml2puppet
The move to LIBEXEC_PATH broke running the puppet from the packages on
Linux and OS X, because there it cannot find the platform plugin
anymore.
We need to add a qt.conf for it, and because Qt Creator.app/Contents/
Resources already contains the qt.conf for Qt Creator itself, the puppet
must also move to its own subdirectory on OS X.
Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'dist/installer')
| -rw-r--r-- | dist/installer/mac/qmldesigner_qt.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/installer/mac/qmldesigner_qt.conf b/dist/installer/mac/qmldesigner_qt.conf new file mode 100644 index 0000000000..c10c195bdd --- /dev/null +++ b/dist/installer/mac/qmldesigner_qt.conf @@ -0,0 +1,4 @@ +[Paths] +Imports = ../../Imports/qtquick1 +Qml2Imports = ../../Imports/qtquick2 +Plugins = ../../PlugIns |