diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-19 14:23:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-23 07:36:58 +0000 |
| commit | 4e2905f880ae84a9a3e72c4c73e5317b87ff6c55 (patch) | |
| tree | d5548ebf80ca867af12350953f81cc7eef756027 /src/plugins/cpaster | |
| parent | e232648d79081446bcdd128f17cc7918659c72e0 (diff) | |
| download | qt-creator-4e2905f880ae84a9a3e72c4c73e5317b87ff6c55.tar.gz | |
Cpaster frontend: Fix deployment
On OS X we may not set QMAKE_RPATH because otherwise the default rpath
to the Qt libs is removed.
Install the tool on Windows and Linux.
Add the plugins path to the rpath on Linux.
Also make the rpath when building relative instead of absolute on Linux.
Change-Id: Ieb6a79d9f9f922d117736ae7b4ae65c784ade5c9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpaster')
| -rw-r--r-- | src/plugins/cpaster/frontend/frontend.pro | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/cpaster/frontend/frontend.pro b/src/plugins/cpaster/frontend/frontend.pro index ea810e3a60..4f0f39b45c 100644 --- a/src/plugins/cpaster/frontend/frontend.pro +++ b/src/plugins/cpaster/frontend/frontend.pro @@ -1,4 +1,3 @@ -TEMPLATE = app TARGET=cpaster QTC_LIB_DEPENDS += \ @@ -7,16 +6,11 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ coreplugin -include(../../../../qtcreator.pri) -include(../../../rpath.pri) +include(../../../qtcreatortool.pri) -CONFIG += console -CONFIG -= app_bundle QT += network -QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH - -DESTDIR=$$IDE_LIBEXEC_PATH +linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$$relative_path($$IDE_PLUGIN_PATH, $$DESTDIR)\' HEADERS = ../protocol.h \ ../cpasterconstants.h \ |