diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-29 10:21:41 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-03 14:16:15 +0000 |
| commit | 2b074f5278aa68434e662fef0d7fce67999d3f3b (patch) | |
| tree | a0dd164b16874b772d68d007d0435c635131a4a9 /scripts/packagePlugins.py | |
| parent | aabd0202cae7df97fc4162c3f8a4e79e7f9d6fb5 (diff) | |
Packaging: Fix deployment for Qt5.6
Qt 5.6 builds with relative RPATH by default on Linux.
Since this additionally leads to very short RPATHs,
we cannot change the relative structure within the
Qt installation (e.g. plugins in bin/, libs somewhere
in lib/qtcreator/).
Instead we now deploy qt into a self-contained lib/Qt/
folder, keeping the original structure, on Linux.
Change-Id: I36136590379c3e7b02ba7de3345369e2384dcc95
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'scripts/packagePlugins.py')
| -rwxr-xr-x | scripts/packagePlugins.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/packagePlugins.py b/scripts/packagePlugins.py index 2f10cf931db..d5487dea92d 100755 --- a/scripts/packagePlugins.py +++ b/scripts/packagePlugins.py @@ -52,7 +52,7 @@ if __name__ == "__main__": if common.is_linux_platform(): qt_install_info = common.get_qt_install_info(arguments.qmake_binary) common.fix_rpaths(arguments.source_directory, - os.path.join(arguments.source_directory, 'lib', 'qtcreator'), + os.path.join(arguments.source_directory, 'lib', 'Qt', 'lib'), qt_install_info) subprocess.check_call([arguments.sevenzip, 'a', '-mx9', arguments.target_file, os.path.join(arguments.source_directory, '*')]) |