Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: If56adeea2f888d8bc34e202b697f735508896c84

2 files changed, 13 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 475fa7e1d..45096e990 100644
--- a/setup.py
+++ b/setup.py
@@ -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