diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-03 11:50:02 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-03 09:24:58 +0000 |
commit | c4e489dc70974212e47edbf876bd02e1e7fd7877 (patch) | |
tree | c6ce53a71743a9b9f3ec025fea0b64d2a4ea0c12 /Cluster | |
parent | 97e035ce4c2b79617475167858b15f88bbcd8c5d (diff) |
Add padding to plugin RPATHs
Installer needs to change the absolute rpaths to relative paths,
but can only do that when the new path is shorter than the original.
Add padding the RPATH to make sure this happens.
Task-number: QTAUTO-336
Change-Id: Ide2ce08b7e01185f9143259db8edf6c9e769c299
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'Cluster')
-rw-r--r-- | Cluster/plugins/gaugefiller/gaugefiller.pro | 2 | ||||
-rw-r--r-- | Cluster/plugins/scenehelper/scenehelper.pro | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Cluster/plugins/gaugefiller/gaugefiller.pro b/Cluster/plugins/gaugefiller/gaugefiller.pro index 01165c0..ce69e71 100644 --- a/Cluster/plugins/gaugefiller/gaugefiller.pro +++ b/Cluster/plugins/gaugefiller/gaugefiller.pro @@ -4,6 +4,8 @@ TARGET = clustergaugefillerplugin QT += qml quick CONFIG += qt plugin c++11 +QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding" + TARGET = $$qtLibraryTarget($$TARGET) uri = com.qtcompany.clustergaugefiller diff --git a/Cluster/plugins/scenehelper/scenehelper.pro b/Cluster/plugins/scenehelper/scenehelper.pro index ca1cfde..be4a573 100644 --- a/Cluster/plugins/scenehelper/scenehelper.pro +++ b/Cluster/plugins/scenehelper/scenehelper.pro @@ -4,6 +4,8 @@ TARGET = clusterscenehelperplugin QT += qml quick 3dcore 3dextras 3drender 3dquick 3dquick-private CONFIG += qt plugin c++11 +QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding" + TARGET = $$qtLibraryTarget($$TARGET) uri = com.qtcompany.clusterscenehelper |