From 66d037808221b84a79583411d40fd3dbbdc12099 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 3 Apr 2017 09:42:56 +0200 Subject: Add a long padded rpath to every plugin This is needed as the installer needs to fix the absolute rpath to a relative during installation and this will only work when the new relative rpath is shorter than the previously set. Task-number: QTAUTO-336 Change-Id: Ib1297db5e3f3ad03d60d6fa733d39ac546186331 Reviewed-by: Iikka Eklund Reviewed-by: Samuli Piippo --- plugins/comtqci18ndemo/comtqci18ndemo.pro | 4 ++++ plugins/datasource/datasource.pro | 4 ++++ plugins/screenmanager/screenmanager.pro | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/plugins/comtqci18ndemo/comtqci18ndemo.pro b/plugins/comtqci18ndemo/comtqci18ndemo.pro index d71de15..d137586 100644 --- a/plugins/comtqci18ndemo/comtqci18ndemo.pro +++ b/plugins/comtqci18ndemo/comtqci18ndemo.pro @@ -3,6 +3,10 @@ TARGET = comtqci18ndemoplugin QT += qml quick CONFIG += qt plugin c++11 +# Add a long padded rpath, so the installer can replace it with a relative rpath +QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding/long_padding/long_padding/long_padding\ + long_padding/long_padding/long_padding/long_padding/long_padding/long_padding/" + TARGET = $$qtLibraryTarget($$TARGET) uri = com.theqtcompany.comtqci18ndemo diff --git a/plugins/datasource/datasource.pro b/plugins/datasource/datasource.pro index 4074c65..1ff92af 100644 --- a/plugins/datasource/datasource.pro +++ b/plugins/datasource/datasource.pro @@ -3,6 +3,10 @@ TARGET = qmldatasources QT += qml quick sql CONFIG += qt plugin +# Add a long padded rpath, so the installer can replace it with a relative rpath +QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding/long_padding/long_padding/long_padding\ + long_padding/long_padding/long_padding/long_padding/long_padding/long_padding/" + TARGET = $$qtLibraryTarget($$TARGET) uri = com.pelagicore.datasource diff --git a/plugins/screenmanager/screenmanager.pro b/plugins/screenmanager/screenmanager.pro index 783e4ea..a191884 100644 --- a/plugins/screenmanager/screenmanager.pro +++ b/plugins/screenmanager/screenmanager.pro @@ -3,6 +3,10 @@ TARGET = screenmanagerplugin QT += qml quick CONFIG += qt plugin c++11 +# Add a long padded rpath, so the installer can replace it with a relative rpath +QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding/long_padding/long_padding/long_padding\ + long_padding/long_padding/long_padding/long_padding/long_padding/long_padding/" + TARGET = $$qtLibraryTarget($$TARGET) uri = com.pelagicore.ScreenManager -- cgit v1.2.3