diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-20 16:06:52 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-20 16:07:00 +0100 |
commit | 329913c29700fbf1adbea498080e3c90689e2259 (patch) | |
tree | 6218ece5c689ccbec0ecbdc775965bf14652dd4d | |
parent | d5692db3b420620e1b4968f9ef0ab88b020f0aca (diff) | |
parent | ea66a78ea73f677a9025e1482e658409cecd7e2a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: If56adeea2f888d8bc34e202b697f735508896c84
-rw-r--r-- | setup.py | 14 | ||||
-rw-r--r-- | sources/shiboken2/tests/libsample/objecttype.h | 1 |
2 files changed, 13 insertions, 2 deletions
@@ -1229,7 +1229,7 @@ class pyside_build(_build): # Check if ICU libraries were copied over to the destination Qt libdir. resolved_destination_lib_dir = destination_lib_dir.format(**vars) - maybe_icu_libs = find_files_using_glob(resolved_destination_lib_dir, "libcu*") + maybe_icu_libs = find_files_using_glob(resolved_destination_lib_dir, "libicu*") # If no ICU libraries are present in the Qt libdir (like when Qt is built against system # ICU, or in the Coin CI where ICU libs are in a different directory) try to @@ -1302,6 +1302,18 @@ class pyside_build(_build): recursive=True, vars=vars, ignore=["*.la", "*.a", "*.cmake", "*.pc", "*.prl"], dir_filter_function=framework_dir_filter) + + # Fix rpath for WebEngine process executable. The already present rpath does not work + # because it assumes a symlink from Versions/5/Helpers, thus adding two more levels of + # directory hierarchy. + if 'QtWebEngineWidgets.framework' in framework_built_modules: + qt_lib_path = "{pyside_package_dir}/PySide2/Qt/lib".format(**vars) + bundle = "QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app" + binary = "Contents/MacOS/QtWebEngineProcess" + webengine_process_path = os.path.join(bundle, binary) + final_path = os.path.join(qt_lib_path, webengine_process_path) + rpath = "@loader_path/../../../../../" + osx_fix_rpaths_for_library(final_path, rpath) else: ignored_modules = [] if 'WebEngineWidgets' not in built_modules: diff --git a/sources/shiboken2/tests/libsample/objecttype.h b/sources/shiboken2/tests/libsample/objecttype.h index 4d85daeff..752659488 100644 --- a/sources/shiboken2/tests/libsample/objecttype.h +++ b/sources/shiboken2/tests/libsample/objecttype.h @@ -129,7 +129,6 @@ public: void destroyCppParent() { delete m_parent; - m_parent = 0; } //Deprecated test |