Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Iafe51380b453ee1849ed65f5342d79c76c21d28d

48 files changed, 12 insertions, 185 deletions

diff --git a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt
index 258a011bf..73682b3bc 100644
--- a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt
@@ -29,9 +29,7 @@ set(Qt3DAnimation_include_dirs
                      ${Qt53DCore_INCLUDE_DIRS}
                      ${Qt53DRender_INCLUDE_DIRS}
                      ${Qt53DAnimation_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${Qt3DCore_GEN_DIR}
@@ -39,8 +37,6 @@ set(Qt3DAnimation_include_dirs
                      ${Qt3DAnimation_GEN_DIR})
 
 set(Qt3DAnimation_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DAnimation_LIBRARIES})
 
 set(Qt3DAnimation_deps Qt3DRender)
diff --git a/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt
index d046f8fc1..e28de3f05 100644
--- a/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt
@@ -50,16 +50,12 @@ set(Qt3DCore_include_dirs
                      ${Qt5Gui_INCLUDE_DIRS}
                      ${Qt5Network_INCLUDE_DIRS}
                      ${Qt53DCore_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${QtNetwork_GEN_DIR})
 
 set(Qt3DCore_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DCore_LIBRARIES})
 
 set(Qt3DCore_deps QtGui QtNetwork)
diff --git a/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt
index bd750949d..e581bc269 100644
--- a/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt
@@ -56,17 +56,13 @@ set(Qt3DExtras_include_dirs
                      ${Qt53DCore_INCLUDE_DIRS}
                      ${Qt53DRender_INCLUDE_DIRS}
                      ${Qt53DExtras_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${Qt3DCore_GEN_DIR}
                      ${Qt3DRender_GEN_DIR})
 
 set(Qt3DExtras_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DExtras_LIBRARIES})
 
 set(Qt3DExtras_deps Qt3DRender)
diff --git a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt
index a3366c9ba..a910e30df 100644
--- a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt
@@ -32,16 +32,12 @@ set(Qt3DInput_include_dirs
                      ${Qt3DInput_BINARY_DIR}
                      ${pyside2_SOURCE_DIR}
                      ${Qt5Core_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${Qt3DCore_GEN_DIR})
 
 set(Qt3DInput_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DInput_LIBRARIES})
 
 set(Qt3DInput_deps Qt3DCore)
diff --git a/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt
index 8cf4de37f..09306f480 100644
--- a/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt
@@ -13,16 +13,12 @@ set(Qt3DLogic_include_dirs
                      ${pyside2_SOURCE_DIR}
                      ${Qt5Core_INCLUDE_DIRS}
                      ${Qt5Gui_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${Qt3DCore_GEN_DIR})
 
 set(Qt3DLogic_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DLogic_LIBRARIES})
 
 set(Qt3DLogic_deps Qt3DCore)
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
index 011536cef..c8bf08f4c 100644
--- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
@@ -131,16 +131,12 @@ set(Qt3DRender_include_dirs
                      ${pyside2_SOURCE_DIR}
                      ${Qt5Core_INCLUDE_DIRS}
                      ${Qt5Gui_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${Qt3DCore_GEN_DIR})
 
 set(Qt3DRender_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt53DRender_LIBRARIES})
 
 set(Qt3DRender_deps Qt3DCore)
diff --git a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt
index 6e9492d48..d7de684b9 100644
--- a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt
@@ -21,16 +21,12 @@ set(QtAxContainer_include_dirs
                      ${Qt5Core_INCLUDE_DIRS}
                      ${Qt5Gui_INCLUDE_DIRS}
                      ${Qt5Widgets_INCLUDE_DIRS}
-                     ${SHIBOKEN_INCLUDE_DIR}
                      ${libpyside_SOURCE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
                      ${QtWidgets_GEN_DIR})
 
 set(QtAxContainer_libraries pyside2
-                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                     ${SHIBOKEN_LIBRARY}
                      ${Qt5AxContainer_LIBRARIES}
                      ${Qt5AxBase_LIBRARIES})
 
diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt
index c7611edb0..a327017a7 100644
--- a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt
@@ -64,16 +64,12 @@ set(QtCharts_include_dirs ${QtCharts_SOURCE_DIR}
                           ${Qt5Gui_INCLUDE_DIRS}
                           ${Qt5Widgets_INCLUDE_DIRS}
                           ${Qt5Charts_INCLUDE_DIRS}
-                          ${SHIBOKEN_INCLUDE_DIR}
                           ${libpyside_SOURCE_DIR}
-                          ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                           ${QtCore_GEN_DIR}
                           ${QtGui_GEN_DIR}
                           ${QtWidgets_GEN_DIR})
 
 set(QtCharts_libraries    pyside2
-                          ${SHIBOKEN_PYTHON_LIBRARIES}
-                          ${SHIBOKEN_LIBRARY}
                           ${Qt5Charts_LIBRARIES}
                           ${Qt5Core_LIBRARIES}
                           ${Qt5Gui_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt
index 9bd5c0547..b9c5e4b75 100644
--- a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt
@@ -10,15 +10,12 @@ set(QtConcurrent_include_dirs   ${QtConcurrent_SOURCE_DIR}
                                 ${QtConcurrent_BINARY_DIR}
                                 ${Qt5Core_INCLUDE_DIRS}
                                 ${Qt5Concurrent_INCLUDE_DIRS}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                 ${QtCore_GEN_DIR}
                                 )
 set(QtConcurrent_libraries  pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${QtConcurrent_LIBRARIES}
+                            ${Qt5Core_LIBRARIES}
                             )
 set(QtConcurrent_deps QtCore)
 
diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index 25d30e8bb..5725c0121 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -191,13 +191,9 @@ configure_file("${QtCore_SOURCE_DIR}/typesystem_core.xml.in"
 set(QtCore_include_dirs ${QtCore_SOURCE_DIR}
                         ${QtCore_BINARY_DIR}
                         ${Qt5Core_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         )
 set(QtCore_libraries  pyside2
-                      ${SHIBOKEN_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
                       ${Qt5Core_LIBRARIES}
                       )
 
diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
index 59c779fbd..40dafdc4e 100644
--- a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
@@ -46,15 +46,11 @@ set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR}
                           ${Qt5Core_INCLUDE_DIRS}
                           ${Qt5Gui_INCLUDE_DIRS}
                           ${Qt5DataVisualization_INCLUDE_DIRS}
-                          ${SHIBOKEN_INCLUDE_DIR}
                           ${libpyside_SOURCE_DIR}
-                          ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                           ${QtCore_GEN_DIR}
                           ${QtGui_GEN_DIR})
 
 set(QtDataVisualization_libraries    pyside2
-                          ${SHIBOKEN_PYTHON_LIBRARIES}
-                          ${SHIBOKEN_LIBRARY}
                           ${Qt5DataVisualization_LIBRARIES}
                           ${Qt5Core_LIBRARIES}
                           ${Qt5Gui_LIBRARIES})
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
index f514ea7c9..48354987d 100644
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
@@ -233,14 +233,10 @@ set(QtGui_include_dirs  ${QtGui_SOURCE_DIR}
                         ${pyside2_SOURCE_DIR}
                         ${Qt5Core_INCLUDE_DIRS}
                         ${Qt5Gui_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         ${QtCore_GEN_DIR}
                         )
 set(QtGui_libraries   pyside2
-                      ${SHIBOKEN_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
                       ${Qt5Gui_LIBRARIES})
 set(QtGui_deps QtCore)
 
diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
index 102eef91f..66086b607 100644
--- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
@@ -23,15 +23,12 @@ set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${Qt5Widgets_INCLUDE_DIRS}
                         ${Qt5Help_INCLUDE_DIRS}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtWidgets_GEN_DIR}
                         ${QtGui_GEN_DIR}
                         ${QtCore_GEN_DIR}
                         )
 set(QtHelp_libraries  pyside2
-                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${Qt5Core_LIBRARIES}
                       ${Qt5Gui_LIBRARIES}
                       ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtLocation/CMakeLists.txt b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt
index b36613256..37cc7e6e5 100644
--- a/sources/pyside2/PySide2/QtLocation/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt
@@ -56,15 +56,11 @@ set(QtLocation_include_dirs ${QtLocation_SOURCE_DIR}
                             ${QtLocation_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Location_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtPositioning_GEN_DIR})
 
 set(QtLocation_libraries pyside2
-                         ${SHIBOKEN_PYTHON_LIBRARIES}
-                         ${SHIBOKEN_LIBRARY}
                          ${Qt5Location_LIBRARIES})
 
 set(QtLocation_deps QtCore QtPositioning)
diff --git a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt
index 281596185..efa7944b1 100644
--- a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt
@@ -16,13 +16,10 @@ set(QtMacExtras_include_dirs ${QtMacExtras_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR})
 
 set(QtMacExtras_libraries pyside2
                         ${Qt5MacExtras_LIBRARIES}
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES})
 
diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
index 71e575da3..4e7642d3a 100644
--- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
@@ -108,16 +108,12 @@ set(QtMultimedia_include_dirs   ${QtMultimedia_SOURCE_DIR}
                                 ${Qt5Gui_INCLUDE_DIRS}
                                 ${Qt5Network_INCLUDE_DIRS}
                                 ${Qt5Multimedia_INCLUDE_DIRS}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                 ${QtCore_GEN_DIR}
                                 ${QtGui_GEN_DIR}
                                 ${QtNetwork_GEN_DIR})
 
 set(QtMultimedia_libraries  pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5Multimedia_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             ${Qt5Gui_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt
index 09c3ce994..7448f5f38 100644
--- a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt
@@ -17,9 +17,7 @@ set(QtMultimediaWidgets_include_dirs ${QtMultimediaWidgets_SOURCE_DIR}
                                      ${Qt5Widgets_INCLUDE_DIRS}
                                      ${Qt5Multimedia_INCLUDE_DIRS}
                                      ${Qt5MultimediaWidgets_INCLUDE_DIRS}
-                                     ${SHIBOKEN_INCLUDE_DIR}
                                      ${libpyside_SOURCE_DIR}
-                                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                      ${QtCore_GEN_DIR}
                                      ${QtGui_GEN_DIR}
                                      ${QtNetwork_GEN_DIR}
@@ -27,8 +25,6 @@ set(QtMultimediaWidgets_include_dirs ${QtMultimediaWidgets_SOURCE_DIR}
                                      ${QtMultimedia_GEN_DIR})
 
 set(QtMultimediaWidgets_libraries    pyside2
-                                     ${SHIBOKEN_PYTHON_LIBRARIES}
-                                     ${SHIBOKEN_LIBRARY}
                                      ${Qt5Multimedia_LIBRARIES}
                                      ${Qt5MultimediaWidgets_LIBRARIES}
                                      ${Qt5Core_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
index cd9517889..52092c2a2 100644
--- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
@@ -97,14 +97,10 @@ set(QtNetwork_include_dirs  ${QtNetwork_SOURCE_DIR}
                             ${QtNetwork_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Network_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR})
 
 set(QtNetwork_libraries pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Network_LIBRARIES})
 
 set(QtNetwork_deps QtCore)
diff --git a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt
index e23cd36b1..1ca245fea 100644
--- a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt
@@ -21,8 +21,6 @@ set(QtOpenGL_include_dirs   ${QtOpenGL_SOURCE_DIR}
                             ${Qt5Gui_INCLUDE_DIRS}
                             ${Qt5Widgets_INCLUDE_DIRS}
                             ${Qt5OpenGL_INCLUDE_DIRS}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
                             ${QtWidgets_GEN_DIR}
                             ${QtGui_GEN_DIR}
@@ -30,7 +28,6 @@ set(QtOpenGL_include_dirs   ${QtOpenGL_SOURCE_DIR}
                             ${QtOpenGL_GEN_DIR}
                             )
 set(QtOpenGL_libraries      pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             ${Qt5Gui_LIBRARIES}
                             ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt
index ecbcd9f78..4745cb492 100644
--- a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt
@@ -32,14 +32,10 @@ set(QtPositioning_include_dirs ${QtPositioning_SOURCE_DIR}
                                ${QtPositioning_BINARY_DIR}
                                ${Qt5Core_INCLUDE_DIRS}
                                ${Qt5Positioning_INCLUDE_DIRS}
-                               ${SHIBOKEN_INCLUDE_DIR}
                                ${libpyside_SOURCE_DIR}
-                               ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                ${QtCore_GEN_DIR})
 
 set(QtPositioning_libraries pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5Positioning_LIBRARIES})
 
 set(QtPositioning_deps QtCore)
diff --git a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt
index 31b86290d..3482c68fe 100644
--- a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt
@@ -19,16 +19,12 @@ set(QtPrintSupport_include_dirs ${QtPrintSupport_SOURCE_DIR}
                                 ${Qt5Gui_INCLUDE_DIRS}
                                 ${Qt5Widgets_INCLUDE_DIRS}
                                 ${Qt5PrintSupport_INCLUDE_DIRS}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                 ${QtCore_GEN_DIR}
                                 ${QtGui_GEN_DIR}
                                 ${QtWidgets_GEN_DIR}
                                 )
 set(QtPrintSupport_libraries    pyside2
-                                ${SHIBOKEN_PYTHON_LIBRARIES}
-                                ${SHIBOKEN_LIBRARY}
                                 ${Qt5Core_LIBRARIES}
                                 ${Qt5Gui_LIBRARIES}
                                 ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtQml/CMakeLists.txt b/sources/pyside2/PySide2/QtQml/CMakeLists.txt
index cfd1b6857..9912016ef 100644
--- a/sources/pyside2/PySide2/QtQml/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtQml/CMakeLists.txt
@@ -40,8 +40,6 @@ set(QtQml_include_dirs  ${QtQml_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${Qt5Network_INCLUDE_DIRS}
                         ${Qt5Qml_INCLUDE_DIRS}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtGui_GEN_DIR}
                         ${QtCore_GEN_DIR}
@@ -49,7 +47,6 @@ set(QtQml_include_dirs  ${QtQml_SOURCE_DIR}
                         ${QtQml_GEN_DIR})
 
 set(QtQml_libraries pyside2
-                    ${SHIBOKEN_PYTHON_LIBRARIES}
                     ${Qt5Core_LIBRARIES}
                     ${Qt5Gui_LIBRARIES}
                     ${Qt5Network_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
index 788d6d50e..6707c210a 100644
--- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
@@ -65,8 +65,6 @@ set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
                           ${Qt5Network_INCLUDE_DIRS}
                           ${Qt5Qml_INCLUDE_DIRS}
                           ${Qt5Quick_INCLUDE_DIRS}
-                          ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                          ${SHIBOKEN_INCLUDE_DIR}
                           ${libpyside_SOURCE_DIR}
                           ${QtGui_GEN_DIR}
                           ${QtCore_GEN_DIR}
@@ -75,7 +73,6 @@ set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
                           ${QtQuick_GEN_DIR})
 
 set(QtQuick_libraries pyside2
-                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${Qt5Core_LIBRARIES}
                       ${Qt5Gui_LIBRARIES}
                       ${Qt5Network_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt
index 76f81870d..1f5ae7980 100644
--- a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt
@@ -15,8 +15,6 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
                                  ${Qt5Quick_INCLUDE_DIRS}
                                  ${Qt5Qml_INCLUDE_DIRS}
                                  ${Qt5QuickWidgets_INCLUDE_DIRS}
-                                 ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                                 ${SHIBOKEN_INCLUDE_DIR}
                                  ${libpyside_SOURCE_DIR}
                                  ${QtGui_GEN_DIR}
                                  ${QtCore_GEN_DIR}
@@ -27,7 +25,6 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
                                  ${QtQuickWidgets_GEN_DIR})
 
 set(QtQuickWidgets_libraries pyside2
-                             ${SHIBOKEN_PYTHON_LIBRARIES}
                              ${Qt5Core_LIBRARIES}
                              ${Qt5Gui_LIBRARIES}
                              ${Qt5Network_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtScript/CMakeLists.txt b/sources/pyside2/PySide2/QtScript/CMakeLists.txt
index dfcb80789..12453729b 100644
--- a/sources/pyside2/PySide2/QtScript/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtScript/CMakeLists.txt
@@ -26,14 +26,10 @@ set(QtScript_include_dirs   ${QtScript_SOURCE_DIR}
                             ${QtScript_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Script_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             )
 set(QtScript_libraries      pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5Core_LIBRARIES}
                             ${Qt5Script_LIBRARIES})
 set(QtScript_deps QtCore)
diff --git a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt
index 39bb0adc6..ddb4bec8f 100644
--- a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt
@@ -13,8 +13,6 @@ set(QtScriptTools_include_dirs  ${QtScriptTools_SOURCE_DIR}
                                 ${Qt5Widgets_INCLUDE_DIRS}
                                 ${Qt5Script_INCLUDE_DIRS}
                                 ${Qt5ScriptTools_INCLUDE_DIRS}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
                                 ${QtCore_GEN_DIR}
                                 ${QtGui_GEN_DIR}
@@ -23,7 +21,6 @@ set(QtScriptTools_include_dirs  ${QtScriptTools_SOURCE_DIR}
                                 )
 
 set(QtScriptTools_libraries pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             ${Qt5Gui_LIBRARIES}
                             ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtScxml/CMakeLists.txt b/sources/pyside2/PySide2/QtScxml/CMakeLists.txt
index 35ca46427..9cf2f0b22 100644
--- a/sources/pyside2/PySide2/QtScxml/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtScxml/CMakeLists.txt
@@ -37,14 +37,10 @@ set(QtScxml_include_dirs ${QtScxml_SOURCE_DIR}
                          ${QtScxml_BINARY_DIR}
                          ${Qt5Core_INCLUDE_DIRS}
                          ${Qt5Scxml_INCLUDE_DIRS}
-                         ${SHIBOKEN_INCLUDE_DIR}
                          ${libpyside_SOURCE_DIR}
-                         ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                          ${QtCore_GEN_DIR})
 
 set(QtScxml_libraries pyside2
-                         ${SHIBOKEN_PYTHON_LIBRARIES}
-                         ${SHIBOKEN_LIBRARY}
                          ${Qt5Scxml_LIBRARIES})
 
 set(QtScxml_deps QtCore)
diff --git a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt
index 933c266c0..2cdd3fe87 100644
--- a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt
@@ -83,14 +83,10 @@ set(QtSensors_include_dirs  ${QtSensors_SOURCE_DIR}
                             ${QtSensors_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Sensors_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR})
 
 set(QtSensors_libraries pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Sensors_LIBRARIES})
 
 set(QtSensors_deps QtCore)
diff --git a/sources/pyside2/PySide2/QtSql/CMakeLists.txt b/sources/pyside2/PySide2/QtSql/CMakeLists.txt
index a72d06118..4abd46694 100644
--- a/sources/pyside2/PySide2/QtSql/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtSql/CMakeLists.txt
@@ -29,16 +29,12 @@ set(QtSql_include_dirs  ${QtSql_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${Qt5Widgets_INCLUDE_DIRS}
                         ${Qt5Sql_INCLUDE_DIRS}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
                         ${QtWidgets_GEN_DIR}
                         )
 set(QtSql_libraries     pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES}
                         ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt
index 9cc2539b1..75b6f2bf5 100644
--- a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt
@@ -15,16 +15,12 @@ set(QtSvg_include_dirs  ${QtSvg_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${Qt5Widgets_INCLUDE_DIRS}
                         ${Qt5Svg_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
                         ${QtWidgets_GEN_DIR}
                         )
 set(QtSvg_libraries     pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES}
                         ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtTest/CMakeLists.txt b/sources/pyside2/PySide2/QtTest/CMakeLists.txt
index ac325ed95..6614bbca1 100644
--- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt
@@ -19,16 +19,12 @@ set(QtTest_include_dirs ${QtTest_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${Qt5Widgets_INCLUDE_DIRS}
                         ${Qt5Test_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
                         ${QtWidgets_GEN_DIR}
                         )
 set(QtTest_libraries    pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Test_LIBRARIES}
                         ${Qt5Widgets_LIBRARIES}
                         ${Qt5Gui_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt
index d9e827c0e..c3080c034 100644
--- a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt
@@ -12,14 +12,10 @@ set(QtTextToSpeech_include_dirs ${QtTextToSpeech_SOURCE_DIR}
                                 ${QtTextToSpeech_BINARY_DIR}
                                 ${Qt5Core_INCLUDE_DIRS}
                                 ${Qt5TextToSpeech_INCLUDE_DIRS}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                                 ${QtCore_GEN_DIR})
 
 set(QtTextToSpeech_libraries    pyside2
-                                ${SHIBOKEN_PYTHON_LIBRARIES}
-                                ${SHIBOKEN_LIBRARY}
                                 ${Qt5Multimedia_LIBRARIES}
                                 ${Qt5TextToSpeech_LIBRARIES}
                                 ${Qt5Core_LIBRARIES})
diff --git a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
index fc034ec1b..1ae44d4fd 100644
--- a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
@@ -18,8 +18,6 @@ set(QtUiTools_include_dirs  ${QtUiTools_SOURCE_DIR}
                             ${Qt5Xml_INCLUDE_DIRS}
                             ${Qt5Designer_INCLUDE_DIRS}
                             ${Qt5UiTools_INCLUDE_DIRS}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
                             ${plugins_SOURCE_DIR}
                             ${QtCore_GEN_DIR}
@@ -29,7 +27,6 @@ set(QtUiTools_include_dirs  ${QtUiTools_SOURCE_DIR}
                             )
 set(QtUiTools_libraries     pyside2
                             uiplugin
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
                             ${Qt5UiTools_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             ${Qt5Gui_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt
index c06c690ac..58957b21e 100644
--- a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt
@@ -11,14 +11,10 @@ set(QtWebChannel_include_dirs ${QtWebChannel_SOURCE_DIR}
                         ${QtWebChannel_BINARY_DIR}
                         ${Qt5Core_INCLUDE_DIRS}
                         ${Qt5WebChannel_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         ${QtCore_GEN_DIR}
                         )
 set(QtWebChannel_libraries    pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5WebChannel_LIBRARIES}
                         ${Qt5Core_LIBRARIES}
                         )
diff --git a/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt
index dc673ad06..25e11d5d9 100644
--- a/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt
@@ -10,14 +10,10 @@ set(QtWebEngine_include_dirs
                             ${QtWebEngine_SOURCE_DIR}
                             ${QtWebEngine_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             )
 set(QtWebEngine_libraries pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5WebEngine_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             )
diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt
index 93ff6f5cc..74c112734 100644
--- a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt
@@ -20,14 +20,10 @@ set(QtWebEngineCore_include_dirs
                             ${QtWebEngineCore_SOURCE_DIR}
                             ${QtWebEngineCore_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             )
 set(QtWebEngineCore_libraries pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5WebEngineCore_LIBRARIES}
                             ${Qt5Core_LIBRARIES}
                             )
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
index 68b0a632f..555be9c41 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
@@ -26,9 +26,7 @@ set(QtWebEngineWidgets_include_dirs
                             ${Qt5Network_INCLUDE_DIRS}
                             ${Qt5WebChannel_INCLUDE_DIRS}
                             ${Qt5WebEngineWidgets_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
                             ${QtWidgets_GEN_DIR}
@@ -38,8 +36,6 @@ set(QtWebEngineWidgets_include_dirs
                             ${QtWebEngineCore_GEN_DIR}
                             )
 set(QtWebEngineWidgets_libraries      pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5WebEngineWidgets_LIBRARIES}
                             ${Qt5Network_LIBRARIES}
                             ${Qt5WebChannel_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt
index 76f647450..cc03b14b4 100644
--- a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt
@@ -12,17 +12,13 @@ set(QtWebKit_include_dirs   ${QtWebKit_SOURCE_DIR}
                             ${Qt5Gui_INCLUDE_DIRS}
                             ${Qt5Network_INCLUDE_DIRS}
                             ${Qt5WebKit_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
                             ${QtWidgets_GEN_DIR}
                             ${QtNetwork_GEN_DIR}
                             )
 set(QtWebKit_libraries      pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5WebKit_LIBRARIES}
                             ${Qt5Network_LIBRARIES}
                             ${Qt5Gui_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
index 7422a05da..4ace240c0 100644
--- a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
@@ -39,9 +39,7 @@ set(QtWebKitWidgets_include_dirs
                             ${Qt5PrintSupport_INCLUDE_DIRS}
                             ${Qt5Network_INCLUDE_DIRS}
                             ${Qt5WebKitWidgets_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
                             ${QtWidgets_GEN_DIR}
@@ -50,8 +48,6 @@ set(QtWebKitWidgets_include_dirs
                             ${QtNetwork_GEN_DIR}
                             )
 set(QtWebKitWidgets_libraries      pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5WebKit_LIBRARIES}
                             ${Qt5WebKitWidgets_LIBRARIES}
                             ${Qt5Network_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
index 98f85f9ab..a28c633af 100644
--- a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
@@ -15,16 +15,12 @@ set(QtWebSockets_include_dirs ${QtWebSockets_SOURCE_DIR}
                         ${Qt5Core_INCLUDE_DIRS}
                         ${Qt5Network_INCLUDE_DIRS}
                         ${Qt5WebSockets_INCLUDE_DIRS}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtWebSockets_GEN_DIR}
                         ${QtNetwork_GEN_DIR}
                         )
 set(QtWebSockets_libraries    pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5WebSockets_LIBRARIES}
                         ${Qt5Network_LIBRARIES}
                         ${Qt5Core_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
index 4267c1160..102c0ee14 100644
--- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
@@ -216,15 +216,11 @@ set(QtWidgets_include_dirs  ${QtWidgets_SOURCE_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Gui_INCLUDE_DIRS}
                             ${Qt5Widgets_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
                             )
 set(QtWidgets_libraries pyside2
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
-                        ${SHIBOKEN_LIBRARY}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES}
                         ${Qt5Widgets_LIBRARIES}
diff --git a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt
index 9729d319a..cf308c31d 100644
--- a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt
@@ -24,13 +24,10 @@ set(QtWinExtras_include_dirs ${QtWinExtras_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR})
 
 set(QtWinExtras_libraries pyside2
                         ${Qt5WinExtras_LIBRARIES}
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES})
 
diff --git a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
index fc0b21f1f..8bc1a7ffd 100644
--- a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
@@ -16,13 +16,10 @@ set(QtX11Extras_include_dirs ${QtX11Extras_SOURCE_DIR}
                         ${Qt5Gui_INCLUDE_DIRS}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
-                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                        ${SHIBOKEN_INCLUDE_DIR}
                         ${libpyside_SOURCE_DIR})
 
 set(QtX11Extras_libraries pyside2
                         ${Qt5X11Extras_LIBRARIES}
-                        ${SHIBOKEN_PYTHON_LIBRARIES}
                         ${Qt5Core_LIBRARIES}
                         ${Qt5Gui_LIBRARIES})
 
diff --git a/sources/pyside2/PySide2/QtXml/CMakeLists.txt b/sources/pyside2/PySide2/QtXml/CMakeLists.txt
index 7a6a707b7..f17a77240 100644
--- a/sources/pyside2/PySide2/QtXml/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtXml/CMakeLists.txt
@@ -38,17 +38,12 @@ ${QtXml_GEN_DIR}/qtxml_module_wrapper.cpp
 
 set(QtXml_include_dirs      ${QtXml_SOURCE_DIR}
                             ${QtXml_BINARY_DIR}
-                            ${CMAKE_SOURCE_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
                             ${Qt5Xml_INCLUDE_DIRS}
-                            ${SHIBOKEN_INCLUDE_DIR}
                             ${libpyside_SOURCE_DIR}
-                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                             ${QtCore_GEN_DIR}
                             )
 set(QtXml_libraries         pyside2
-                            ${SHIBOKEN_PYTHON_LIBRARIES}
-                            ${SHIBOKEN_LIBRARY}
                             ${Qt5Xml_LIBRARIES})
 set(QtXml_deps QtCore)
 
diff --git a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt
index d9e936517..696c09c1a 100644
--- a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt
@@ -24,13 +24,10 @@ set(QtXmlPatterns_include_dirs  ${QtXmlPatterns_SOURCE_DIR}
                                 ${QtXmlPatterns_BINARY_DIR}
                                 ${Qt5Core_INCLUDE_DIRS}
                                 ${Qt5XmlPatterns_INCLUDE_DIRS}
-                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                                ${SHIBOKEN_INCLUDE_DIR}
                                 ${libpyside_SOURCE_DIR}
                                 ${QtCore_GEN_DIR}
                                 )
 set(QtXmlPatterns_libraries     pyside2
-                                ${SHIBOKEN_PYTHON_LIBRARIES}
                                 ${Qt5Core_LIBRARIES}
                                 ${Qt5XmlPatterns_LIBRARIES})
 set(QtXmlPatterns_deps QtCore)
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index ca88b9740..629484458 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -1618,12 +1618,16 @@ double in = %CONVERTTOCPP[double](%in);
 // a class supported by QVariant?
 int typeCode;
 const char *typeName = QVariant_resolveMetaType(Py_TYPE(%in), &typeCode);
-if (!typeCode || !typeName)
-    return;
-QVariant var(typeCode, (void*)0);
-Shiboken::Conversions::SpecificConverter converter(typeName);
-converter.toCpp(pyIn, var.data());
-%out = var;
+if (!typeCode || !typeName) {
+    // If the type was not encountered, return a default PyObjectWrapper
+    %out = QVariant::fromValue(PySide::PyObjectWrapper(%in));
+}
+else {
+    QVariant var(typeCode, (void*)0);
+    Shiboken::Conversions::SpecificConverter converter(typeName);
+    converter.toCpp(pyIn, var.data());
+    %out = var;
+}
 // @snippet conversion-sbkobject
 
 // @snippet conversion-pydict
diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py
index f1913d03f..a92ee76f0 100644
--- a/sources/pyside2/PySide2/support/generate_pyi.py
+++ b/sources/pyside2/PySide2/support/generate_pyi.py
@@ -279,13 +279,6 @@ def generate_all_pyi(outpath, options):
         sys.path[0:0] = sys_path
         pypath = ps.join(sys_path)
         os.environ["PYTHONPATH"] = pypath
-    if options.lib_path:
-        # the path changes are automatically propagated to subprocesses
-        ospath_var = "PATH" if sys.platform == "win32" else "LD_LIBRARY_PATH"
-        old_val = os.environ.get(ospath_var, "")
-        lib_path = [os.path.normpath(_) for _ in options.lib_path]
-        ospath = ps.join(lib_path + old_val.split(ps))
-        os.environ[ospath_var] = ospath
 
     # now we can import
     global PySide2, inspect, HintingEnumerator
@@ -336,8 +329,6 @@ if __name__ == "__main__":
         help="the output directory (default = binary location)")
     parser_run.add_argument("--sys-path", nargs="+",
         help="a list of strings prepended to sys.path")
-    parser_run.add_argument("--lib-path", nargs="+",
-        help="a list of strings prepended to LD_LIBRARY_PATH (unix) or PATH (windows)")
     options = parser.parse_args()
     if options.command == "run":
         if options.quiet:
diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py
index d56d97454..2b234ecd4 100644
--- a/sources/pyside2/PySide2/support/signature/mapping.py
+++ b/sources/pyside2/PySide2/support/signature/mapping.py
@@ -52,6 +52,7 @@ in sys.modules. This minimizes the loading overhead.
 import PySide2
 
 from signature_loader.sbk_mapping import *
+from signature_loader.sbk_mapping import _NotCalled
 
 Sbk_Reloader = Reloader