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 /scripts | |
| parent | e232648d79081446bcdd128f17cc7918659c72e0 (diff) | |
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 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 1932a28134..da122efc34 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -91,7 +91,8 @@ def fix_rpaths_helper(chrpath_bin, install_dir, dirpath, filenames): for filename in filenames: fpath = os.path.join(dirpath, filename) relpath = os.path.relpath(install_dir+'/lib/qtcreator', dirpath) - command = [chrpath_bin, '-r', '$ORIGIN/'+relpath, fpath] + relpluginpath = os.path.relpath(install_dir+'/lib/qtcreator/plugins', dirpath) + command = [chrpath_bin, '-r', '$ORIGIN/'+relpath+':$ORIGIN/'+relpluginpath, fpath] print fpath, ':', command try: subprocess.check_call(command) |