Commit 86fa6f2f authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Add BUILD_PUPPET_IN_CREATOR_BINPATH environment variable

Change-Id: I9ec514c7005f2ecddea7885c10c9c8520987c3fc
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent a97242e3
......@@ -153,7 +153,9 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
} else {
applicationPath = macOSBundlePath(applicationPath);
applicationPath += QLatin1Char('/') + qmlPuppetApplicationName();
#ifdef QT_NO_DEBUG // to prevent of choosing the wrong puppet in debug
#if defined(QT_NO_DEBUG) || defined(SEARCH_PUPPET_IN_CREATOR_BINPATH) // to prevent of choosing the wrong puppet in debug
if (!QFileInfo(applicationPath).exists()) { //No qmlpuppet in Qt
//We have to find out how to give not too intrusive feedback
applicationPath = creatorQmlPuppetPath();
......
......@@ -20,3 +20,9 @@ include(components/importmanager/importmanager.pri)
include(qmldesignerplugin.pri)
DEFINES -= QT_NO_CAST_FROM_ASCII
BUILD_PUPPET_IN_CREATOR_BINPATH = $$(BUILD_PUPPET_IN_CREATOR_BINPATH)
!isEmpty(BUILD_PUPPET_IN_CREATOR_BINPATH) {
DEFINES += SEARCH_PUPPET_IN_CREATOR_BINPATH
message("Search puppet in qtcreator bin path!")
}
......@@ -4,9 +4,18 @@ TEMPLATE = app
include(../../../../qtcreator.pri)
DESTDIR = $$IDE_BIN_PATH
BUILD_PUPPET_IN_CREATOR_BINPATH = $$(BUILD_PUPPET_IN_CREATOR_BINPATH)
CONFIG(debug):isEmpty(BUILD_PUPPET_IN_CREATOR_BINPATH) {
DESTDIR = $$[QT_INSTALL_BINS]
} else {
DESTDIR = $$IDE_BIN_PATH
message("Build puppet in qtcreator bin path!")
}
include(../../../rpath.pri)
include(../../../../share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri)
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/../../../shared/qtcreator_pch.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment