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 /src | |
| 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 'src')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 5 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/qml2puppet.pro | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 78b5909d3a..97cf34f77e 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -291,7 +291,10 @@ QString PuppetCreator::qmlPuppetDirectory(PuppetType puppetType) const QString PuppetCreator::defaultPuppetFallbackDirectory() { - return Core::ICore::libexecPath(); + if (Utils::HostOsInfo::isMacHost()) + return Core::ICore::libexecPath() + QLatin1String("/qmldesigner"); + else + return Core::ICore::libexecPath(); } QString PuppetCreator::qmlPuppetFallbackDirectory() const diff --git a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro index bc45de844d..9644cf4bca 100644 --- a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro +++ b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro @@ -4,7 +4,8 @@ TEMPLATE = app include(../../../../qtcreator.pri) -DESTDIR = $$IDE_LIBEXEC_PATH +osx: DESTDIR = $$IDE_LIBEXEC_PATH/qmldesigner +else: DESTDIR = $$IDE_LIBEXEC_PATH include(../../../rpath.pri) |