diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-04-03 09:42:56 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-04-03 08:37:25 +0000 |
| commit | 66d037808221b84a79583411d40fd3dbbdc12099 (patch) | |
| tree | fd4a2164b9342088198a3787e34ea6be477c4962 /plugins | |
| parent | b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d (diff) | |
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 <iikka.eklund@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/comtqci18ndemo/comtqci18ndemo.pro | 4 | ||||
| -rw-r--r-- | plugins/datasource/datasource.pro | 4 | ||||
| -rw-r--r-- | plugins/screenmanager/screenmanager.pro | 4 |
3 files changed, 12 insertions, 0 deletions
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 |