diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-04 14:41:36 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-04 14:41:36 +0100 |
| commit | 04f0123c43ab602880da3fd41c9f650882ac39b6 (patch) | |
| tree | 3c9d289b3d10285dc9e164cdf6a8232f656d7036 /src/tools | |
| parent | 03a52b9c8725992408f0087294ab1bc5be9159e6 (diff) | |
| parent | 5ece12d4ea9291f1063b9c7ec71fb9764537cfdb (diff) | |
Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/cplusplus-shared/tool.pri | 2 | ||||
| -rw-r--r-- | src/tools/iostool/iostool.pro | 2 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/qml2puppet.pro | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/cplusplus-shared/tool.pri b/src/tools/cplusplus-shared/tool.pri index 569d099e2f..dbd31739a3 100644 --- a/src/tools/cplusplus-shared/tool.pri +++ b/src/tools/cplusplus-shared/tool.pri @@ -1,6 +1,8 @@ QTC_LIB_DEPENDS += cplusplus include(../../../qtcreator.pri) + +RPATH_BASE = $$IDE_BIN_PATH include(../../rpath.pri) DESTDIR = $$IDE_BIN_PATH diff --git a/src/tools/iostool/iostool.pro b/src/tools/iostool/iostool.pro index 8ea9a78d6b..4ecd607ac2 100644 --- a/src/tools/iostool/iostool.pro +++ b/src/tools/iostool/iostool.pro @@ -19,6 +19,8 @@ include(../../../qtcreator.pri) # put into a subdir, so we can deploy a separate qt.conf for it DESTDIR = $$IDE_LIBEXEC_PATH/ios + +RPATH_BASE = $$DESTDIR include(../../rpath.pri) SOURCES += main.cpp \ diff --git a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro index 9644cf4bca..403f8e24fb 100644 --- a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro +++ b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro @@ -7,6 +7,7 @@ include(../../../../qtcreator.pri) osx: DESTDIR = $$IDE_LIBEXEC_PATH/qmldesigner else: DESTDIR = $$IDE_LIBEXEC_PATH +RPATH_BASE = $$DESTDIR include(../../../rpath.pri) include(../../../../share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri) |