Merge remote-tracking branch 'origin/5.14' into 5.14.2

Change-Id: I1c48ecc24ff07e760415cea1d7ed512a99c838a1

59 files changed, 968 insertions, 249 deletions

diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index abca942b9..fcbd010e2 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -144,8 +144,8 @@ def prepare_packages_posix(self, vars):
             executables.extend(copydir(
                 "{install_dir}/bin/Designer.app",
                 "{st_build_dir}/{st_package_name}/Designer.app",
-                filter=None,
-                recursive=True, vars=vars))
+                filter=None, recursive=True,
+                force=False, vars=vars))
         else:
             copyfile(
                 "{install_dir}/bin/designer",
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 8df12ee4c..325b02dec 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -110,7 +110,12 @@ def call_setup(python_ver, phase):
     if phase in ["BUILD"]:
         rmtree(_env, True)
         run_instruction(["virtualenv", "-p", _pExe,  _env], "Failed to create virtualenv")
-        install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six", "wheel"])
+        # When the 'python_ver' variable is empty, we are using Python 2
+        # setuptools from v45+ removed the support for Python 2, so we pin an old release
+        install_pip_dependencies(env_pip, ["pip",
+                                           "numpy" if python_ver else "numpy==1.16.6",
+                                           "setuptools" if python_ver else "setuptools==44.0.0",
+                                           "sphinx", "six", "wheel"])
 
     cmd = [env_python, "-u", "setup.py"]
     if phase in ["BUILD"]:
diff --git a/dist/changes-5.14.2 b/dist/changes-5.14.2
index 4efa8e548..3473d41e3 100644
--- a/dist/changes-5.14.2
+++ b/dist/changes-5.14.2
@@ -17,15 +17,19 @@ information about a particular change.
 *                                  PySide2                                 *
 ****************************************************************************
 
+ - [PYSIDE-135]  Add doc getter for Property
  - [PYSIDE-239]  Python enum types can now be used as a valid signal type.
+ - [PYSIDE-939]  Fix Python 3.8 warnings about deprecated int conversions of
+                 enums/flags
  - [PYSIDE-571]  qApp has been turned into a normal Python variable. This
-                 implies that QtWidgets.qApp no longer works; it should be
-                 replaced by qApp.
- - [PYSIDE-803]  GUI slowdowns caused by background threads have been fixed
-                 by reducing GIL allocation and usage of
+                 implies that QtWidgets.qApp no longer works;
+                 it should be replaced by qApp.
+ - [PYSIDE-803]  GUI slowdowns caused by background threads have been fixed by
+                 reducing GIL allocation and usage of
                  Py_(BEGIN|END)_ALLOW_THREADS.
  - [PYSIDE-858]  Windows binaries are now signed.
- - [PYSIDE-939]
+ - [PYSIDE-939]  Fix testrunner for Python 3.8/Linux
+ - [PYSIDE-946]  Add functions with callback of QWebEnginePage
  - [PYSIDE-1231] Further issues introduced by Python 3.8 have been addressed:
                  - Warnings about deprecated int conversions of enumerations
                    and flags have been fixed.
@@ -37,6 +41,12 @@ information about a particular change.
  - [PYSIDE-1204] QByteArray now properly supports the PyBuffer interface.
  - [PYSIDE-1214] For accessors returning non-exposed classes inheriting
                  QObject, the most-derived wrapper is now created.
+ - [PYSIDE-1229] testrunner: Fix disrupted lines in the error log
+ - [PYSIDE-1236] Fix running scriptableapplication in a virtualenv on Windows
+                 with Python 3.8
+ - [PYSIDE-1247] Avoid a signature warning in Python 3.6
+ - [PYSIDE-1250] PySide2: Use int for QVariant conversion when possible
+ - [PYSIDE-1251] Invert QTreeWidgetItem clear function loop
 
 ****************************************************************************
 *                                  Shiboken2                               *
@@ -48,5 +58,9 @@ information about a particular change.
  - [PYSIDE-1112] The shiboken documentation has been re-structured.
  - [PYSIDE-1228] Typedef'ed anonymous enums are now supported.
  - [PYSIDE-1240] The manual test dumpcodemodel has been modified to output
-                 typesystem XML, enabling convenient generation of
-                 typesystem file skeletons for new bindings.
+                 typesystem XML, enabling convenient generation of typesystem
+                 file skeletons for new bindings.
+ - [PYSIDE-1241] Improve error messages about invalid types of added functions
+ - [PYSIDE-1241] Enable flags types in added functions
+ - [PYSIDE-1246] Fix classes with virtual destructors not being considered
+                 polymorphic
diff --git a/examples/axcontainer/axviewer.py b/examples/axcontainer/axviewer.py
index 8d0226394..e9083d8f4 100644
--- a/examples/axcontainer/axviewer.py
+++ b/examples/axcontainer/axviewer.py
@@ -43,7 +43,7 @@
 
 import sys
 from PySide2.QtAxContainer import QAxSelect, QAxWidget
-from PySide2.QtWidgets import (QAction, qApp, QApplication, QDialog,
+from PySide2.QtWidgets import (QAction, QApplication, QDialog,
     QMainWindow, QMessageBox, QToolBar)
 
 class MainWindow(QMainWindow):
diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py
index 1ba725b7d..e18e92cf2 100644
--- a/examples/charts/chartthemes/main.py
+++ b/examples/charts/chartthemes/main.py
@@ -41,7 +41,7 @@
 """PySide2 port of the Chart Themes example from Qt v5.x"""
 
 import sys
-from PySide2.QtCore import qApp, QPointF, Qt
+from PySide2.QtCore import QPointF, Qt
 from PySide2.QtGui import QColor, QPainter, QPalette
 from PySide2.QtWidgets import (QApplication, QMainWindow, QSizePolicy,
     QWidget)
diff --git a/examples/multimedia/camera.py b/examples/multimedia/camera.py
index cd8d1cffc..d58b526d9 100644
--- a/examples/multimedia/camera.py
+++ b/examples/multimedia/camera.py
@@ -45,7 +45,7 @@ import os, sys
 from PySide2.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl
 from PySide2.QtGui import QGuiApplication, QDesktopServices, QIcon
 from PySide2.QtGui import QImage, QPixmap
-from PySide2.QtWidgets import (QAction, qApp, QApplication, QHBoxLayout, QLabel,
+from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel,
     QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget)
 from PySide2.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo
 from PySide2.QtMultimediaWidgets import QCameraViewfinder
diff --git a/examples/multimedia/player.py b/examples/multimedia/player.py
index ecf5c0793..cb70e50d6 100644
--- a/examples/multimedia/player.py
+++ b/examples/multimedia/player.py
@@ -44,7 +44,7 @@
 import sys
 from PySide2.QtCore import QStandardPaths, Qt
 from PySide2.QtGui import QIcon, QKeySequence
-from PySide2.QtWidgets import (QAction, qApp, QApplication, QDialog, QFileDialog,
+from PySide2.QtWidgets import (QAction, QApplication, QDialog, QFileDialog,
     QMainWindow, QSlider, QStyle, QToolBar)
 from PySide2.QtMultimedia import QMediaPlayer, QMediaPlaylist
 from PySide2.QtMultimediaWidgets import QVideoWidget
diff --git a/examples/sql/books/bookwindow.py b/examples/sql/books/bookwindow.py
index 3bd56bc52..31d2a055f 100644
--- a/examples/sql/books/bookwindow.py
+++ b/examples/sql/books/bookwindow.py
@@ -40,7 +40,7 @@
 
 from __future__ import print_function, absolute_import
 
-from PySide2.QtWidgets import (QAbstractItemView, qApp, QDataWidgetMapper,
+from PySide2.QtWidgets import (QAbstractItemView, QDataWidgetMapper,
     QHeaderView, QMainWindow, QMessageBox)
 from PySide2.QtGui import QKeySequence
 from PySide2.QtSql import QSqlRelation, QSqlRelationalTableModel, QSqlTableModel
diff --git a/examples/uiloader/uiloader.py b/examples/uiloader/uiloader.py
new file mode 100644
index 000000000..1e6e72d78
--- /dev/null
+++ b/examples/uiloader/uiloader.py
@@ -0,0 +1,71 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Qt for Python examples of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:BSD$
+## You may use this file under the terms of the BSD license as follows:
+##
+## "Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+##   * Redistributions of source code must retain the above copyright
+##     notice, this list of conditions and the following disclaimer.
+##   * Redistributions in binary form must reproduce the above copyright
+##     notice, this list of conditions and the following disclaimer in
+##     the documentation and/or other materials provided with the
+##     distribution.
+##   * Neither the name of The Qt Company Ltd nor the names of its
+##     contributors may be used to endorse or promote products derived
+##     from this software without specific prior written permission.
+##
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+"""QUiLoader example, showing how to dynamically load a Qt Designer form
+   from a UI file."""
+
+from argparse import ArgumentParser, RawTextHelpFormatter
+import sys
+
+from PySide2.QtCore import Qt, QFile, QIODevice
+from PySide2.QtWidgets import QApplication, QWidget
+from PySide2.QtUiTools import QUiLoader
+
+
+if __name__ == '__main__':
+    arg_parser = ArgumentParser(description="QUiLoader example",
+                                formatter_class=RawTextHelpFormatter)
+    arg_parser.add_argument('file', type=str, help='UI file')
+    args = arg_parser.parse_args()
+    ui_file_name = args.file
+
+    app = QApplication(sys.argv)
+    ui_file = QFile(ui_file_name)
+    if not ui_file.open(QIODevice.ReadOnly):
+        print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
+        sys.exit(-1)
+    loader = QUiLoader()
+    widget = loader.load(ui_file, None)
+    ui_file.close()
+    if not widget:
+        print(loader.errorString())
+        sys.exit(-1)
+    widget.show()
+    sys.exit(app.exec_())
diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
index e0901d64f..612c682cb 100644
--- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
@@ -38,7 +38,9 @@
 ##
 #############################################################################
 
-import json, os, warnings
+import json
+import os
+import warnings
 
 from PySide2 import QtCore
 from PySide2.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl
@@ -53,24 +55,28 @@ _default_bookmarks = [
     ['Tool Bar'],
     ['http://qt.io', 'Qt', ':/qt-project.org/qmessagebox/images/qtlogo-64.png'],
     ['https://download.qt.io/snapshots/ci/pyside/', 'Downloads'],
-    ['https://doc-snapshots.qt.io/qtforpython/', 'Documentation'],
+    ['https://doc.qt.io/qtforpython/', 'Documentation'],
     ['https://bugreports.qt.io/projects/PYSIDE/', 'Bug Reports'],
     ['https://www.python.org/', 'Python', None],
     ['https://wiki.qt.io/PySide2', 'Qt for Python', None],
     ['Other Bookmarks']
 ]
 
+
 def _config_dir():
     return '{}/QtForPythonBrowser'.format(
         QStandardPaths.writableLocation(QStandardPaths.ConfigLocation))
 
+
 _bookmark_file = 'bookmarks.json'
 
+
 def _create_folder_item(title):
     result = QStandardItem(title)
     result.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
     return result
 
+
 def _create_item(url, title, icon):
     result = QStandardItem(title)
     result.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
@@ -79,6 +85,7 @@ def _create_item(url, title, icon):
         result.setIcon(icon)
     return result
 
+
 # Create the model from an array of arrays
 def _create_model(parent, serialized_bookmarks):
     result = QStandardItemModel(0, 1, parent)
@@ -94,6 +101,7 @@ def _create_model(parent, serialized_bookmarks):
             last_folder_item.appendRow(_create_item(url, title, icon))
     return result
 
+
 # Serialize model into an array of arrays, writing out the icons
 # into .png files under directory in the process
 def _serialize_model(model, directory):
@@ -111,12 +119,14 @@ def _serialize_model(model, directory):
                 icon_sizes = icon.availableSizes()
                 largest_size = icon_sizes[len(icon_sizes) - 1]
                 icon_file_name = '{}/icon{:02}_{:02}_{}.png'.format(directory,
-                               f, i, largest_size.width())
+                                                                    f, i,
+                                                                    largest_size.width())
                 icon.pixmap(largest_size).save(icon_file_name, 'PNG')
                 entry.append(icon_file_name)
             result.append(entry)
     return result
 
+
 # Bookmarks as a tree view to be used in a dock widget with
 # functionality to persist and populate tool bars and menus.
 class BookmarkWidget(QTreeView):
@@ -187,7 +197,8 @@ class BookmarkWidget(QTreeView):
                     action.setData(url)
                     action.setVisible(True)
             else:
-                action = target_object.addAction(icon, BookmarkWidget.short_title(title))
+                short_title = BookmarkWidget.short_title(title)
+                action = target_object.addAction(icon, short_title)
                 action.setToolTip(title)
                 action.setData(url)
                 action.triggered.connect(self._action_activated)
@@ -206,7 +217,7 @@ class BookmarkWidget(QTreeView):
         index = self.currentIndex()
         if index.isValid():
             item = self._model.itemFromIndex(index)
-            if item.parent(): # exclude top level items
+            if item.parent():  # exclude top level items
                 return item
         return None
 
@@ -224,9 +235,9 @@ class BookmarkWidget(QTreeView):
             self._remove_item(current_item)
 
     def _remove_item(self, item):
-        button = QMessageBox.question(self, "Remove",
-            "Would you like to remove \"{}\"?".format(item.text()),
-            QMessageBox.Yes | QMessageBox.No)
+        message = "Would you like to remove \"{}\"?".format(item.text())
+        button = QMessageBox.question(self, "Remove", message,
+                                      QMessageBox.Yes | QMessageBox.No)
         if button == QMessageBox.Yes:
             item.parent().removeRow(item.row())
 
@@ -246,11 +257,11 @@ class BookmarkWidget(QTreeView):
         bookmark_file_name = os.path.join(native_dir_path, _bookmark_file)
         print('Writing {}...'.format(bookmark_file_name))
         with open(bookmark_file_name, 'w') as bookmark_file:
-            json.dump(serialized_model, bookmark_file, indent = 4)
+            json.dump(serialized_model, bookmark_file, indent=4)
 
     def _read_bookmarks(self):
         bookmark_file_name = os.path.join(QDir.toNativeSeparators(_config_dir()),
-                                        _bookmark_file)
+                                          _bookmark_file)
         if os.path.exists(bookmark_file_name):
             print('Reading {}...'.format(bookmark_file_name))
             return json.load(open(bookmark_file_name))
diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
index 1fa3be9d7..8b96b3ddd 100644
--- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
@@ -48,6 +48,7 @@ from PySide2.QtCore import Qt, QUrl
 from PySide2.QtWidgets import QMenu, QTabBar, QTabWidget
 from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage
 
+
 class BrowserTabWidget(QTabWidget):
     """Enables having several tabs with QWebEngineView."""
 
@@ -60,7 +61,7 @@ class BrowserTabWidget(QTabWidget):
         self.setTabsClosable(True)
         self._window_factory_function = window_factory_function
         self._webengineviews = []
-        self._history_windows = {} # map WebengineView to HistoryWindow
+        self._history_windows = {}  # map WebengineView to HistoryWindow
         self.currentChanged.connect(self._current_changed)
         self.tabCloseRequested.connect(self.handle_tab_close_request)
         self._actions_enabled = {}
@@ -74,7 +75,8 @@ class BrowserTabWidget(QTabWidget):
 
     def add_browser_tab(self):
         factory_func = partial(BrowserTabWidget.add_browser_tab, self)
-        web_engine_view = WebEngineView(factory_func, self._window_factory_function)
+        web_engine_view = WebEngineView(factory_func,
+                                        self._window_factory_function)
         index = self.count()
         self._webengineviews.append(web_engine_view)
         title = 'Tab {}'.format(index + 1)
@@ -209,7 +211,7 @@ class BrowserTabWidget(QTabWidget):
         elif chosen_action == close_other_tabs_action:
             for t in range(tab_count - 1, -1, -1):
                 if t != index:
-                     self.handle_tab_close_request(t)
+                    self.handle_tab_close_request(t)
         elif chosen_action == close_tabs_to_the_right_action:
             for t in range(tab_count - 1, index, -1):
                 self.handle_tab_close_request(t)
diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
index c9f8620e6..a118f6eec 100644
--- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
@@ -45,6 +45,7 @@ from PySide2.QtGui import QDesktopServices
 from PySide2.QtWidgets import QMenu, QProgressBar, QStyleFactory
 from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem
 
+
 # A QProgressBar with context menu for displaying downloads in a QStatusBar.
 class DownloadWidget(QProgressBar):
     """Lets you track progress of a QWebEngineDownloadItem."""
@@ -63,7 +64,8 @@ class DownloadWidget(QProgressBar):
         description = QFileInfo(path).fileName()
         description_length = len(description)
         if description_length > 30:
-            description = '{}...{}'.format(description[0:10], description[description_length - 10:])
+            description = '{}...{}'.format(description[0:10],
+                                           description[description_length - 10:])
         self.setFormat('{} %p%'.format(description))
         self.setOrientation(Qt.Horizontal)
         self.setMinimum(0)
@@ -89,7 +91,7 @@ class DownloadWidget(QProgressBar):
     def _update_tool_tip(self):
         path = self._download_item.path()
         tool_tip = "{}\n{}".format(self._download_item.url().toString(),
-            QDir.toNativeSeparators(path))
+                                   QDir.toNativeSeparators(path))
         total_bytes = self._download_item.total_bytes()
         if total_bytes > 0:
             tool_tip += "\n{}K".format(total_bytes / 1024)
@@ -136,7 +138,8 @@ class DownloadWidget(QProgressBar):
         if chosen_action == launch_action:
             self._launch()
         elif chosen_action == show_in_folder_action:
-            DownloadWidget.open_file(QFileInfo(self._download_item.path()).absolutePath())
+            path = QFileInfo(self._download_item.path()).absolutePath()
+            DownloadWidget.open_file(path)
         elif chosen_action == cancel_action:
             self._download_item.cancel()
         elif chosen_action == remove_action:
diff --git a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py
index b47b01504..3557c2e31 100644
--- a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py
+++ b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py
@@ -44,6 +44,7 @@ from PySide2.QtGui import QIcon, QKeySequence
 from PySide2.QtWidgets import QCheckBox, QLineEdit, QToolBar, QToolButton
 from PySide2.QtWebEngineWidgets import QWebEnginePage
 
+
 # A Find tool bar (bottom area)
 class FindToolBar(QToolBar):
 
@@ -59,12 +60,13 @@ class FindToolBar(QToolBar):
         self.addWidget(self._line_edit)
 
         self._previous_button = QToolButton()
-        self._previous_button.setIcon(QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
+        style_icons = ':/qt-project.org/styles/commonstyle/images/'
+        self._previous_button.setIcon(QIcon(style_icons + 'up-32.png'))
         self._previous_button.clicked.connect(self._find_previous)
         self.addWidget(self._previous_button)
 
         self._next_button = QToolButton()
-        self._next_button.setIcon(QIcon(':/qt-project.org/styles/commonstyle/images/down-32.png'))
+        self._next_button.setIcon(QIcon(style_icons + 'down-32.png'))
         self._next_button.clicked.connect(self._find_next)
         self.addWidget(self._next_button)
 
@@ -73,7 +75,7 @@ class FindToolBar(QToolBar):
 
         self._hideButton = QToolButton()
         self._hideButton.setShortcut(QKeySequence(Qt.Key_Escape))
-        self._hideButton.setIcon(QIcon(':/qt-project.org/styles/macstyle/images/closedock-16.png'))
+        self._hideButton.setIcon(QIcon(style_icons + 'closedock-16.png'))
         self._hideButton.clicked.connect(self.hide)
         self.addWidget(self._hideButton)
 
@@ -81,7 +83,7 @@ class FindToolBar(QToolBar):
         self._line_edit.setFocus()
 
     def _emit_find(self, backward):
-        needle =  self._line_edit.text().strip()
+        needle = self._line_edit.text().strip()
         if needle:
             flags = QWebEnginePage.FindFlags()
             if self._case_sensitive_checkbox.isChecked():
diff --git a/examples/webenginewidgets/tabbedbrowser/historywindow.py b/examples/webenginewidgets/tabbedbrowser/historywindow.py
index 701ee1c85..6ce779743 100644
--- a/examples/webenginewidgets/tabbedbrowser/historywindow.py
+++ b/examples/webenginewidgets/tabbedbrowser/historywindow.py
@@ -45,7 +45,7 @@ from PySide2.QtCore import Signal, QAbstractTableModel, QModelIndex, Qt, QUrl
 
 class HistoryModel(QAbstractTableModel):
 
-    def __init__(self, history, parent = None):
+    def __init__(self, history, parent=None):
         super(HistoryModel, self).__init__(parent)
         self._history = history
 
diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py
index b17dea561..8a75cd5e0 100644
--- a/examples/webenginewidgets/tabbedbrowser/main.py
+++ b/examples/webenginewidgets/tabbedbrowser/main.py
@@ -50,30 +50,35 @@ from webengineview import WebEngineView
 from PySide2 import QtCore
 from PySide2.QtCore import Qt, QUrl
 from PySide2.QtGui import QKeySequence, QIcon
-from PySide2.QtWidgets import (qApp, QAction, QApplication,
-    QDockWidget, QLabel, QLineEdit, QMainWindow, QToolBar)
+from PySide2.QtWidgets import (QAction, QApplication, QDockWidget, QLabel,
+                               QLineEdit, QMainWindow, QToolBar)
 from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage
 
 main_windows = []
 
+
 def create_main_window():
     """Creates a MainWindow using 75% of the available screen resolution."""
     main_win = MainWindow()
     main_windows.append(main_win)
     available_geometry = app.desktop().availableGeometry(main_win)
-    main_win.resize(available_geometry.width() * 2 / 3, available_geometry.height() * 2 / 3)
+    main_win.resize(available_geometry.width() * 2 / 3,
+                    available_geometry.height() * 2 / 3)
     main_win.show()
     return main_win
 
+
 def create_main_window_with_browser():
     """Creates a MainWindow with a BrowserTabWidget."""
     main_win = create_main_window()
     return main_win.add_browser_tab()
 
+
 class MainWindow(QMainWindow):
     """Provides the parent window that includes the BookmarkWidget,
     BrowserTabWidget, and a DownloadWidget, to offer the complete
     web browsing experience."""
+
     def __init__(self):
         super(MainWindow, self).__init__()
 
@@ -126,33 +131,33 @@ class MainWindow(QMainWindow):
     def _create_menu(self):
         file_menu = self.menuBar().addMenu("&File")
         exit_action = QAction(QIcon.fromTheme("application-exit"), "E&xit",
-                             self, shortcut = "Ctrl+Q", triggered=qApp.quit)
+                              self, shortcut="Ctrl+Q", triggered=qApp.quit)
         file_menu.addAction(exit_action)
 
         navigation_menu = self.menuBar().addMenu("&Navigation")
 
         style_icons = ':/qt-project.org/styles/commonstyle/images/'
         back_action = QAction(QIcon.fromTheme("go-previous",
-                                             QIcon(style_icons + 'left-32.png')),
-                             "Back", self,
-                             shortcut = QKeySequence(QKeySequence.Back),
-                             triggered = self._tab_widget.back)
+                                              QIcon(style_icons + 'left-32.png')),
+                              "Back", self,
+                              shortcut=QKeySequence(QKeySequence.Back),
+                              triggered=self._tab_widget.back)
         self._actions[QWebEnginePage.Back] = back_action
         back_action.setEnabled(False)
         navigation_menu.addAction(back_action)
         forward_action = QAction(QIcon.fromTheme("go-next",
-                                                QIcon(style_icons + 'right-32.png')),
-                                "Forward", self,
-                                shortcut = QKeySequence(QKeySequence.Forward),
-                                triggered = self._tab_widget.forward)
+                                                 QIcon(style_icons + 'right-32.png')),
+                                 "Forward", self,
+                                 shortcut=QKeySequence(QKeySequence.Forward),
+                                 triggered=self._tab_widget.forward)
         forward_action.setEnabled(False)
         self._actions[QWebEnginePage.Forward] = forward_action
 
         navigation_menu.addAction(forward_action)
         reload_action = QAction(QIcon(style_icons + 'refresh-32.png'),
-                               "Reload", self,
-                               shortcut = QKeySequence(QKeySequence.Refresh),
-                               triggered = self._tab_widget.reload)
+                                "Reload", self,
+                                shortcut=QKeySequence(QKeySequence.Refresh),
+                                triggered=self._tab_widget.reload)
         self._actions[QWebEnginePage.Reload] = reload_action
         reload_action.setEnabled(False)
         navigation_menu.addAction(reload_action)
@@ -160,39 +165,39 @@ class MainWindow(QMainWindow):
         navigation_menu.addSeparator()
 
         new_tab_action = QAction("New Tab", self,
-                             shortcut = 'Ctrl+T',
-                             triggered = self.add_browser_tab)
+                                 shortcut='Ctrl+T',
+                                 triggered=self.add_browser_tab)
         navigation_menu.addAction(new_tab_action)
 
         close_tab_action = QAction("Close Current Tab", self,
-                                 shortcut = "Ctrl+W",
-                                 triggered = self._close_current_tab)
+                                   shortcut="Ctrl+W",
+                                   triggered=self._close_current_tab)
         navigation_menu.addAction(close_tab_action)
 
         navigation_menu.addSeparator()
 
         history_action = QAction("History...", self,
-                                 triggered = self._tab_widget.show_history)
+                                 triggered=self._tab_widget.show_history)
         navigation_menu.addAction(history_action)
 
         edit_menu = self.menuBar().addMenu("&Edit")
 
         find_action = QAction("Find", self,
-                             shortcut = QKeySequence(QKeySequence.Find),
-                             triggered = self._show_find)
+                              shortcut=QKeySequence(QKeySequence.Find),
+                              triggered=self._show_find)
         edit_menu.addAction(find_action)
 
         edit_menu.addSeparator()
         undo_action = QAction("Undo", self,
-                             shortcut = QKeySequence(QKeySequence.Undo),
-                             triggered = self._tab_widget.undo)
+                              shortcut=QKeySequence(QKeySequence.Undo),
+                              triggered=self._tab_widget.undo)
         self._actions[QWebEnginePage.Undo] = undo_action
         undo_action.setEnabled(False)
         edit_menu.addAction(undo_action)
 
         redo_action = QAction("Redo", self,
-                             shortcut = QKeySequence(QKeySequence.Redo),
-                             triggered = self._tab_widget.redo)
+                              shortcut=QKeySequence(QKeySequence.Redo),
+                              triggered=self._tab_widget.redo)
         self._actions[QWebEnginePage.Redo] = redo_action
         redo_action.setEnabled(False)
         edit_menu.addAction(redo_action)
@@ -200,22 +205,22 @@ class MainWindow(QMainWindow):
         edit_menu.addSeparator()
 
         cut_action = QAction("Cut", self,
-                            shortcut = QKeySequence(QKeySequence.Cut),
-                            triggered = self._tab_widget.cut)
+                             shortcut=QKeySequence(QKeySequence.Cut),
+                             triggered=self._tab_widget.cut)
         self._actions[QWebEnginePage.Cut] = cut_action
         cut_action.setEnabled(False)
         edit_menu.addAction(cut_action)
 
         copy_action = QAction("Copy", self,
-                             shortcut = QKeySequence(QKeySequence.Copy),
-                             triggered = self._tab_widget.copy)
+                              shortcut=QKeySequence(QKeySequence.Copy),
+                              triggered=self._tab_widget.copy)
         self._actions[QWebEnginePage.Copy] = copy_action
         copy_action.setEnabled(False)
         edit_menu.addAction(copy_action)
 
         paste_action = QAction("Paste", self,
-                             shortcut = QKeySequence(QKeySequence.Paste),
-                             triggered = self._tab_widget.paste)
+                               shortcut=QKeySequence(QKeySequence.Paste),
+                               triggered=self._tab_widget.paste)
         self._actions[QWebEnginePage.Paste] = paste_action
         paste_action.setEnabled(False)
         edit_menu.addAction(paste_action)
@@ -223,24 +228,24 @@ class MainWindow(QMainWindow):
         edit_menu.addSeparator()
 
         select_all_action = QAction("Select All", self,
-                                  shortcut = QKeySequence(QKeySequence.SelectAll),
-                                  triggered = self._tab_widget.select_all)
+                                    shortcut=QKeySequence(QKeySequence.SelectAll),
+                                    triggered=self._tab_widget.select_all)
         self._actions[QWebEnginePage.SelectAll] = select_all_action
         select_all_action.setEnabled(False)
         edit_menu.addAction(select_all_action)
 
         self._bookmark_menu = self.menuBar().addMenu("&Bookmarks")
         add_bookmark_action = QAction("&Add Bookmark", self,
-                                    triggered = self._add_bookmark)
+                                      triggered=self._add_bookmark)
         self._bookmark_menu.addAction(add_bookmark_action)
         add_tool_bar_bookmark_action = QAction("&Add Bookmark to Tool Bar", self,
-                                           triggered = self._add_tool_bar_bookmark)
+                                               triggered=self._add_tool_bar_bookmark)
         self._bookmark_menu.addAction(add_tool_bar_bookmark_action)
         self._bookmark_menu.addSeparator()
 
         tools_menu = self.menuBar().addMenu("&Tools")
         download_action = QAction("Open Downloads", self,
-                                 triggered = DownloadWidget.open_download_directory)
+                                  triggered=DownloadWidget.open_download_directory)
         tools_menu.addAction(download_action)
 
         window_menu = self.menuBar().addMenu("&Window")
@@ -250,26 +255,26 @@ class MainWindow(QMainWindow):
         window_menu.addSeparator()
 
         zoom_in_action = QAction(QIcon.fromTheme("zoom-in"),
-                               "Zoom In", self,
-                               shortcut = QKeySequence(QKeySequence.ZoomIn),
-                               triggered = self._zoom_in)
+                                 "Zoom In", self,
+                                 shortcut=QKeySequence(QKeySequence.ZoomIn),
+                                 triggered=self._zoom_in)
         window_menu.addAction(zoom_in_action)
         zoom_out_action = QAction(QIcon.fromTheme("zoom-out"),
-                                "Zoom Out", self,
-                                shortcut = QKeySequence(QKeySequence.ZoomOut),
-                                triggered = self._zoom_out)
+                                  "Zoom Out", self,
+                                  shortcut=QKeySequence(QKeySequence.ZoomOut),
+                                  triggered=self._zoom_out)
         window_menu.addAction(zoom_out_action)
 
         reset_zoom_action = QAction(QIcon.fromTheme("zoom-original"),
-                                  "Reset Zoom", self,
-                                  shortcut = "Ctrl+0",
-                                  triggered = self._reset_zoom)
+                                    "Reset Zoom", self,
+                                    shortcut="Ctrl+0",
+                                    triggered=self._reset_zoom)
         window_menu.addAction(reset_zoom_action)
 
         about_menu = self.menuBar().addMenu("&About")
         about_action = QAction("About Qt", self,
-                              shortcut = QKeySequence(QKeySequence.HelpContents),
-                              triggered=qApp.aboutQt)
+                               shortcut=QKeySequence(QKeySequence.HelpContents),
+                               triggered=qApp.aboutQt)
         about_menu.addAction(about_action)
 
     def add_browser_tab(self):
@@ -348,15 +353,15 @@ class MainWindow(QMainWindow):
     def _download_requested(self, item):
         # Remove old downloads before opening a new one
         for old_download in self.statusBar().children():
-            if type(old_download).__name__ == 'download_widget' and \
-                old_download.state() != QWebEngineDownloadItem.DownloadInProgress:
+            if (type(old_download).__name__ == 'download_widget' and
+                old_download.state() != QWebEngineDownloadItem.DownloadInProgress):
                 self.statusBar().removeWidget(old_download)
                 del old_download
 
         item.accept()
         download_widget = download_widget(item)
         download_widget.removeRequested.connect(self._remove_download_requested,
-                                               Qt.QueuedConnection)
+                                                Qt.QueuedConnection)
         self.statusBar().addWidget(download_widget)
 
     def _remove_download_requested(self):
@@ -376,6 +381,7 @@ class MainWindow(QMainWindow):
     def write_bookmarks(self):
         self._bookmark_widget.write_bookmarks()
 
+
 if __name__ == '__main__':
     app = QApplication(sys.argv)
     main_win = create_main_window()
diff --git a/examples/webenginewidgets/tabbedbrowser/webengineview.py b/examples/webenginewidgets/tabbedbrowser/webengineview.py
index 3b24df001..81b156f93 100644
--- a/examples/webenginewidgets/tabbedbrowser/webengineview.py
+++ b/examples/webenginewidgets/tabbedbrowser/webengineview.py
@@ -43,10 +43,11 @@ from PySide2.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
 from PySide2 import QtCore
 
 _web_actions = [QWebEnginePage.Back, QWebEnginePage.Forward,
-               QWebEnginePage.Reload,
-               QWebEnginePage.Undo, QWebEnginePage.Redo,
-               QWebEnginePage.Cut, QWebEnginePage.Copy,
-               QWebEnginePage.Paste, QWebEnginePage.SelectAll]
+                QWebEnginePage.Reload,
+                QWebEnginePage.Undo, QWebEnginePage.Redo,
+                QWebEnginePage.Cut, QWebEnginePage.Copy,
+                QWebEnginePage.Paste, QWebEnginePage.SelectAll]
+
 
 class WebEngineView(QWebEngineView):
 
@@ -79,7 +80,8 @@ class WebEngineView(QWebEngineView):
         return self.page().action(web_action).isEnabled()
 
     def createWindow(self, window_type):
-        if window_type == QWebEnginePage.WebBrowserTab or window_type == QWebEnginePage.WebBrowserBackgroundTab:
+        if (window_type == QWebEnginePage.WebBrowserTab or
+            window_type == QWebEnginePage.WebBrowserBackgroundTab):
             return self._tab_factory_func()
         return self._window_factory_func()
 
diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py
index c9922f46e..55805e469 100644
--- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py
+++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py
@@ -47,7 +47,7 @@ import re
 from PySide2.QtCore import (QFile, Qt, QTextStream)
 from PySide2.QtGui import (QColor, QFont, QKeySequence, QSyntaxHighlighter,
     QTextCharFormat)
-from PySide2.QtWidgets import (qApp, QApplication, QFileDialog, QMainWindow,
+from PySide2.QtWidgets import (QApplication, QFileDialog, QMainWindow,
     QPlainTextEdit)
 
 import syntaxhighlighter_rc
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index f64a8fd73..b418d2689 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -2885,6 +2885,7 @@
       <object-type name="Connection">
         <include file-name="qobjectdefs.h" location="global"/>
       </object-type>
+    <modify-function signature="^invokeMethod\(" allow-thread="yes"/>
   </object-type>
   <value-type name="QMetaProperty" >
     <!-- This isn't part of Qt public API -->
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 12c1ac33d..223eff773 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -64,7 +64,7 @@
     <object-type name="QQuickImageResponse" since="5.6"/>
 
     <object-type name="QQuickTransform"/>
-    <object-type name="QQuickItem" delete-in-main-thread="true" no-override-caching="true">
+    <object-type name="QQuickItem" delete-in-main-thread="true">
         <value-type name="UpdatePaintNodeData"/>
         <enum-type name="Flag" flags="Flags"/>
         <enum-type name="ItemChange"/>
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
index e0821a114..b18d4359a 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
@@ -73,6 +73,24 @@
     <enum-type name="FileSelectionMode"/>
     <enum-type name="JavaScriptConsoleMessageLevel"/>
     <enum-type name="RenderProcessTerminationStatus"/>
+    <add-function signature="findText(const QString &amp;,QWebEnginePage::FindFlags,PyObject*)">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-findtext"/>
+    </add-function>
+    <add-function signature="print(QPrinter*,PyObject*)">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-print"/>
+    </add-function>
+    <add-function signature="toPlainText(PyObject*) const">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-convertto"/>
+    </add-function>
+    <add-function signature="toHtml(PyObject*) const">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-convertto"/>
+    </add-function>
+    <add-function signature="runJavaScript(const QString &amp;,quint32,PyObject*)">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-runjavascript"/>
+    </add-function>
+    <add-function signature="printToPdf(PyObject*,const QPageLayout &amp;)">
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-printtopdf"/>
+    </add-function>
   </object-type>
 
   <object-type name="QWebEngineProfile">
@@ -94,7 +112,11 @@
     <enum-type name="WebAttribute"/>
   </object-type>
 
-  <object-type name="QWebEngineView"/>
+  <object-type name="QWebEngineView">
+      <add-function signature="findText(const QString &amp;,QWebEnginePage::FindFlags,PyObject*)">
+          <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-findtext"/>
+      </add-function>
+  </object-type>
 
   <value-type name="QWebEngineContextMenuData">
     <enum-type name="EditFlag" flags="EditFlags" since="5.11"/>
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index b870afa55..169b89cae 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -43,6 +43,7 @@
 
 // @snippet include-pyside
 #include <pyside.h>
+#include <limits>
 // @snippet include-pyside
 
 // @snippet pystring-check
@@ -1684,7 +1685,7 @@ Py_UNICODE *unicode = PyUnicode_AS_UNICODE(%in);
 // cast as Py_UNICODE can be a different type
 %out = QString::fromUcs4((const uint *)unicode);
 # else
-%out = QString::fromUtf16((const ushort *)unicode, PyUnicode_GET_SIZE(%in));
+%out = QString::fromUtf16((const ushort *)unicode, PepUnicode_GetLength(%in));
 # endif
 #else
 wchar_t *temp = PyUnicode_AsWideCharString(%in, NULL);
@@ -1716,8 +1717,11 @@ int i = %CONVERTTOCPP[int](%in);
 // @snippet conversion-pyint
 
 // @snippet conversion-qlonglong
+// PYSIDE-1250: For QVariant, if the type fits into an int; use int preferably.
 qlonglong in = %CONVERTTOCPP[qlonglong](%in);
-%out = %OUTTYPE(in);
+constexpr qlonglong intMax = qint64(std::numeric_limits<int>::max());
+constexpr qlonglong intMin = qint64(std::numeric_limits<int>::min());
+%out = in >= intMin && in <= intMax ? %OUTTYPE(int(in)) : %OUTTYPE(in);
 // @snippet conversion-qlonglong
 
 // @snippet conversion-qstring
diff --git a/sources/pyside2/PySide2/glue/qtwebenginewidgets.cpp b/sources/pyside2/PySide2/glue/qtwebenginewidgets.cpp
new file mode 100644
index 000000000..5ee9f3554
--- /dev/null
+++ b/sources/pyside2/PySide2/glue/qtwebenginewidgets.cpp
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// @snippet qwebenginepage-findtext
+auto callable = %PYARG_3;
+auto callback = [callable](bool found)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 3 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](found));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
+// @snippet qwebenginepage-findtext
+
+// @snippet qwebenginepage-print
+auto printer = %PYARG_1;
+auto callable = %PYARG_2;
+auto callback = [printer, callable](bool succeeded)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 2 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](succeeded));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+    Py_DECREF(printer);
+
+};
+Py_INCREF(printer); // Add a reference to the printer until asynchronous printing has finished
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, callback);
+// @snippet qwebenginepage-print
+
+// @snippet qwebenginepage-convertto
+auto callable = %PYARG_1;
+auto callback = [callable](const QString &text)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 1 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](text));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(callback);
+// @snippet qwebenginepage-convertto
+
+// @snippet qwebenginepage-runjavascript
+auto callable = %PYARG_3;
+auto callback = [callable](const QVariant &result)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 3 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    switch (result.type()) {
+    case QVariant::Bool: {
+        const bool value = result.toBool();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
+    }
+        break;
+     case QVariant::Int:
+     case QVariant::UInt:
+     case QVariant::LongLong:
+     case QVariant::ULongLong:
+     case QVariant::Double: {
+        const double number = result.toDouble();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[double](number));
+    }
+        break;
+    default: {
+        const QString value = result.toString();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
+    }
+        break;
+    }
+   // PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](found));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
+// @snippet qwebenginepage-runjavascript
+
+// @snippet qwebenginepage-printtopdf
+auto callable = %PYARG_1;
+auto callback = [callable](const QByteArray &pdf)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 1 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QByteArray](pdf));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(callback, %2);
+// @snippet qwebenginepage-printtopdf
diff --git a/sources/pyside2/PySide2/glue/qtwidgets.cpp b/sources/pyside2/PySide2/glue/qtwidgets.cpp
index 1c663364c..4f9baadf1 100644
--- a/sources/pyside2/PySide2/glue/qtwidgets.cpp
+++ b/sources/pyside2/PySide2/glue/qtwidgets.cpp
@@ -413,7 +413,15 @@ for (auto *item : items) {
 // @snippet qtreewidget-clear
 QTreeWidgetItem *rootItem = %CPPSELF.invisibleRootItem();
 Shiboken::BindingManager &bm = Shiboken::BindingManager::instance();
-for (int i = 0, i_count = rootItem->childCount(); i < i_count; ++i) {
+
+// PYSIDE-1251:
+// Since some objects can be created with a parent and without
+// being saved on a local variable (refcount = 1), they will be
+// deleted when setting the parent to nullptr, so we change the loop
+// to do this from the last child to the first, to avoid the case
+// when the child(1) points to the original child(2) in case the
+// first one was removed.
+for (int i = rootItem->childCount() - 1; i >= 0; --i) {
     QTreeWidgetItem *item = rootItem->child(i);
     if (SbkObject *wrapper = bm.retrieveWrapper(item))
         Shiboken::Object::setParent(nullptr, reinterpret_cast<PyObject *>(wrapper));
diff --git a/sources/pyside2/doc/pyside-examples/examples.qdoc b/sources/pyside2/doc/pyside-examples/examples.qdoc
index d82b33cf7..748c4f8fd 100644
--- a/sources/pyside2/doc/pyside-examples/examples.qdoc
+++ b/sources/pyside2/doc/pyside-examples/examples.qdoc
@@ -28,5 +28,10 @@
 /*!
     \group all-pyside-examples
     \title All Qt for Python Examples
-    \brief A list of all the examples that are available with the Qt for Python package.
+    \brief A varied selection of examples can be found in the 'examples' directory of the
+    pyside-setup repository. This can be accessed after installing
+    PySide2 via pip, checking the 'site-packages/PySide2/examples' directory.
+
+    This page aims to document the most important use cases of the module
+    and it will be extended with each release.
 */
diff --git a/sources/pyside2/doc/tutorials/basictutorial/uifiles.rst b/sources/pyside2/doc/tutorials/basictutorial/uifiles.rst
index a45bfc18c..2c0178e2e 100644
--- a/sources/pyside2/doc/tutorials/basictutorial/uifiles.rst
+++ b/sources/pyside2/doc/tutorials/basictutorial/uifiles.rst
@@ -163,12 +163,17 @@ The complete code of this example looks like this:
     if __name__ == "__main__":
         app = QApplication(sys.argv)
 
-        ui_file = QFile("mainwindow.ui")
-        ui_file.open(QFile.ReadOnly)
-
+        ui_file_name = "mainwindow.ui"
+        ui_file = QFile(ui_file_name)
+        if not ui_file.open(QIODevice.ReadOnly):
+            print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
+            sys.exit(-1)
         loader = QUiLoader()
         window = loader.load(ui_file)
         ui_file.close()
+        if not window:
+            print(loader.errorString())
+            sys.exit(-1)
         window.show()
 
         sys.exit(app.exec_())
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
index 51e6598b3..dae9e2059 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp
+++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
@@ -140,7 +140,8 @@ MetaObjectBuilder::MetaObjectBuilder(PyTypeObject *type, const QMetaObject *meta
 
 MetaObjectBuilder::~MetaObjectBuilder()
 {
-    qDeleteAll(m_d->m_cachedMetaObjects);
+    for (auto *metaObject : m_d->m_cachedMetaObjects)
+        free(const_cast<QMetaObject*>(metaObject));
     delete m_d->m_builder;
     delete m_d;
 }
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index 74a77e6c3..bdabf1202 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -61,6 +61,9 @@ static PyObject *qPropertyGetter(PyObject *, PyObject *);
 static int qpropertyTraverse(PyObject *self, visitproc visit, void *arg);
 static int qpropertyClear(PyObject *self);
 
+// Attributes
+static PyObject *qPropertyDocGet(PyObject *, void *);
+
 static PyMethodDef PySidePropertyMethods[] = {
     {"setter", (PyCFunction)qPropertySetter, METH_O, 0},
     {"write", (PyCFunction)qPropertySetter, METH_O, 0},
@@ -69,6 +72,11 @@ static PyMethodDef PySidePropertyMethods[] = {
     {0, 0, 0, 0}
 };
 
+static PyGetSetDef PySidePropertyType_getset[] = {
+    {"__doc__", qPropertyDocGet, nullptr, nullptr, nullptr},
+    {nullptr, nullptr, nullptr, nullptr, nullptr}
+};
+
 static PyType_Slot PySidePropertyType_slots[] = {
     {Py_tp_dealloc, (void *)qpropertyDeAlloc},
     {Py_tp_call, (void *)qPropertyCall},
@@ -77,6 +85,7 @@ static PyType_Slot PySidePropertyType_slots[] = {
     {Py_tp_methods, (void *)PySidePropertyMethods},
     {Py_tp_init, (void *)qpropertyTpInit},
     {Py_tp_new, (void *)qpropertyTpNew},
+    {Py_tp_getset, PySidePropertyType_getset},
     {0, 0}
 };
 // Dotted modulename is crucial for PyType_FromSpec to work. Is this name right?
@@ -265,6 +274,24 @@ PyObject *qPropertyGetter(PyObject *self, PyObject *callback)
     return nullptr;
 }
 
+static PyObject *qPropertyDocGet(PyObject *self, void *)
+{
+    auto data = reinterpret_cast<PySideProperty *>(self);
+    PySidePropertyPrivate *pData = data->d;
+
+    QByteArray doc(pData->doc);
+    if (!doc.isEmpty()) {
+#if PY_MAJOR_VERSION >= 3
+        return PyUnicode_FromString(doc);
+#else
+        return PyString_FromString(doc);
+#endif
+    }
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
 static int qpropertyTraverse(PyObject *self, visitproc visit, void *arg)
 {
     PySidePropertyPrivate *data = reinterpret_cast<PySideProperty *>(self)->d;
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp
index 01b347a3d..8e8cc9f02 100644
--- a/sources/pyside2/libpyside/signalmanager.cpp
+++ b/sources/pyside2/libpyside/signalmanager.cpp
@@ -114,18 +114,24 @@ namespace PySide {
 PyObjectWrapper::PyObjectWrapper()
     :m_me(Py_None)
 {
+    // PYSIDE-813: When PYSIDE-164 was solved by adding some thread allowance,
+    // this code was no longer protected. It was hard to find this connection.
+    // See the website https://bugreports.qt.io/browse/PYSIDE-813 for details.
+    Shiboken::GilState gil;
     Py_XINCREF(m_me);
 }
 
 PyObjectWrapper::PyObjectWrapper(PyObject *me)
     : m_me(me)
 {
+    Shiboken::GilState gil;
     Py_XINCREF(m_me);
 }
 
 PyObjectWrapper::PyObjectWrapper(const PyObjectWrapper &other)
     : m_me(other.m_me)
 {
+    Shiboken::GilState gil;
     Py_XINCREF(m_me);
 }
 
@@ -142,6 +148,7 @@ PyObjectWrapper::~PyObjectWrapper()
 
 void PyObjectWrapper::reset(PyObject *o)
 {
+    Shiboken::GilState gil;
     Py_XINCREF(o);
     Py_XDECREF(m_me);
     m_me = o;
@@ -559,7 +566,10 @@ static MetaObjectBuilder *metaBuilderFromDict(PyObject *dict)
     if (!dict || !PyDict_Contains(dict, metaObjectAttr))
         return nullptr;
 
-    PyObject *pyBuilder = PyDict_GetItem(dict, metaObjectAttr);
+    // PYSIDE-813: The above assumption is not true in debug mode:
+    // PyDict_GetItem would touch PyThreadState_GET and the global error state.
+    // PyDict_GetItemWithError instead can work without GIL.
+    PyObject *pyBuilder = PyDict_GetItemWithError(dict, metaObjectAttr);
 #ifdef IS_PY3K
     return reinterpret_cast<MetaObjectBuilder *>(PyCapsule_GetPointer(pyBuilder, nullptr));
 #else
diff --git a/sources/pyside2/libpyside/signalmanager.h b/sources/pyside2/libpyside/signalmanager.h
index 229ddb91d..fe077bd1a 100644
--- a/sources/pyside2/libpyside/signalmanager.h
+++ b/sources/pyside2/libpyside/signalmanager.h
@@ -43,6 +43,7 @@
 #include "pysidemacros.h"
 
 #include <sbkpython.h>
+#include <shibokenmacros.h>
 
 #include <QtCore/QMetaMethod>
 
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py
index 982ddc38d..639f6d276 100644
--- a/sources/pyside2/tests/QtCore/qsettings_test.py
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -75,10 +75,7 @@ class TestQSettings(unittest.TestCase):
 
         # Handling zero value
         r = settings.value('zero_value')
-        if py3k.IS_PY3K:
-            self.assertEqual(type(r), int)
-        else:
-            self.assertEqual(type(r), long)
+        self.assertEqual(type(r), int)
 
         r = settings.value('zero_value', type=int)
         self.assertEqual(type(r), int)
diff --git a/sources/pyside2/tests/QtWebEngineWidgets/fox.html b/sources/pyside2/tests/QtWebEngineWidgets/fox.html
new file mode 100644
index 000000000..da873b1cc
--- /dev/null
+++ b/sources/pyside2/tests/QtWebEngineWidgets/fox.html
@@ -0,0 +1,7 @@
+<html>
+<title>Title</title>
+<meta name="description" content="PySide Test METADATA." />
+<body>
+<p>The quick <b>brown</b> fox <i>jumps</i> over the lazy dog.</p>
+</body>
+</html>
diff --git a/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py b/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py
index a40e29887..c650a21d0 100644
--- a/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py
+++ b/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py
@@ -28,24 +28,59 @@
 
 from __future__ import print_function
 
+from functools import partial
 import os
 import sys
 import unittest
 
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+TEST_DIR = os.path.dirname(os.path.abspath(__file__))
+
+sys.path.append(os.path.dirname(TEST_DIR))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide2 import QtWidgets
-from PySide2 import QtWebEngineWidgets
+from PySide2.QtCore import QCoreApplication, QSize, QUrl, Qt
+from PySide2.QtWidgets import QApplication, QVBoxLayout, QWidget
+from PySide2.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
+
 
 class MainTest(unittest.TestCase):
 
     def test_WebEngineView_findText_exists(self):
-        qApp = (QtWidgets.QApplication.instance() or
-                QtWidgets.QApplication([]))
-        view = QtWebEngineWidgets.QWebEngineView()
-        view.findText("nothing")
+        QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
+        app = QApplication.instance() or QApplication()
+        top_level = QWidget()
+        layout = QVBoxLayout(top_level)
+        self._view = QWebEngineView()
+        self._view.loadFinished.connect(self.loaded)
+        self._view.load(QUrl.fromLocalFile(os.path.join(TEST_DIR, "fox.html")))
+        self._view.setMinimumSize(QSize(400, 300))
+        self._callback_count = 0
+        layout.addWidget(self._view)
+        top_level.show()
+        app.exec_()
+
+    def found_callback(self, found):
+        self.assertTrue(found)
+        self._callback_count += 1
+        if self._callback_count == 2:
+            QCoreApplication.quit()
+
+    def javascript_callback(self, result):
+        self.assertEqual(result, "Title")
+        self._callback_count += 1
+        if self._callback_count == 2:
+            QCoreApplication.quit()
+
+    def loaded(self, ok):
+        self.assertTrue(ok)
+        if not ok:
+            QCoreApplication.quit()
+        self._view.page().runJavaScript("document.title", 1,
+                                        partial(self.javascript_callback))
+        self._view.findText("fox", QWebEnginePage.FindFlags(),
+                            partial(self.found_callback))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index 3ba2ad29d..46a8023c3 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -143,6 +143,7 @@ PYSIDE_TEST(mixin_signal_slots_test.py)
 PYSIDE_TEST(modelview_test.py)
 PYSIDE_TEST(new_inherited_functions_test.py)
 PYSIDE_TEST(notify_id.py)
+PYSIDE_TEST(properties_test.py)
 PYSIDE_TEST(qapp_like_a_macro_test.py)
 PYSIDE_TEST(qvariant_test.py)
 PYSIDE_TEST(repr_test.py)
diff --git a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
index 1378ca8ad..111d4ebbf 100644
--- a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
+++ b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
@@ -39,7 +39,10 @@ init_test_paths(True)
 from helper.usesqapplication import UsesQApplication
 from testbinding import TestView
 from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QAbstractItemDelegate, QComboBox
+from PySide2.QtGui import QStandardItem, QStandardItemModel
+from PySide2.QtWidgets import (QAbstractItemDelegate, QComboBox,
+                               QSpinBox, QStyledItemDelegate,
+                               QStyleOptionViewItem, QWidget)
 
 id_text = 'This is me'
 
@@ -83,6 +86,19 @@ class EditorCreatedByDelegateTest(UsesQApplication):
         self.assertEqual(editor.itemData(0, Qt.DisplayRole), id_text)
         editor.metaObject()
 
+    def testIntDelegate(self):
+        """PYSIDE-1250: When creating a QVariant, use int instead of long long
+           for anything that fits into a int. Verify by checking that a spin
+           box is created as item view editor for int."""
+        item = QStandardItem()
+        item.setData(123123, Qt.EditRole)  # <-- QVariant conversion here
+        model = QStandardItemModel()
+        model.appendRow(item)
+        style_option = QStyleOptionViewItem()
+        delegate = QStyledItemDelegate()
+        editor = delegate.createEditor(None, style_option, model.index(0, 0))
+        self.assertEqual(type(editor), QSpinBox)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside2/tests/pysidetest/properties_test.py b/sources/pyside2/tests/pysidetest/properties_test.py
new file mode 100644
index 000000000..cedfac8d1
--- /dev/null
+++ b/sources/pyside2/tests/pysidetest/properties_test.py
@@ -0,0 +1,132 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
+from PySide2.QtCore import QObject, QStringListModel, Signal, Property, Slot
+
+"""Tests PySide2.QtCore.Property()"""
+
+
+class TestObject(QObject):
+
+    valueChanged = Signal()
+
+    def __init__(self, parent=None):
+        super(TestObject, self).__init__(parent)
+        self._value = -1
+        self.valueChanged.connect(self._changed)
+        self.getter_called = 0
+        self.setter_called = 0
+        self.changed_emitted = 0
+
+    @Slot(int)
+    def _changed(self):
+        self.changed_emitted += 1
+
+    def getValue(self):
+        self.getter_called += 1
+        return self._value
+
+    def setValue(self, value):
+        self.setter_called += 1
+        if (self._value != value):
+            self._value = value
+            self.valueChanged.emit()
+
+    value = Property(int, fget=getValue, fset=setValue,
+                     notify=valueChanged)
+
+
+class TestDerivedObject(QStringListModel):
+
+    valueChanged = Signal()
+
+    def __init__(self, parent=None):
+        super(TestDerivedObject, self).__init__(parent)
+        self._value = -1
+        self.valueChanged.connect(self._changed)
+        self.getter_called = 0
+        self.setter_called = 0
+        self.changed_emitted = 0
+
+    @Slot(int)
+    def _changed(self):
+        self.changed_emitted += 1
+
+    def getValue(self):
+        self.getter_called += 1
+        return self._value
+
+    def setValue(self, value):
+        self.setter_called += 1
+        if (self._value != value):
+            self._value = value
+            self.valueChanged.emit()
+
+    value = Property(int, fget=getValue, fset=setValue,
+                     notify=valueChanged)
+
+
+class PropertyTest(unittest.TestCase):
+
+    def test1Object(self):
+        """Basic property test."""
+        testObject = TestObject()
+        v = testObject.value
+        self.assertEqual(v, -1)
+        self.assertEqual(testObject.getter_called, 1)
+        testObject.value = 42
+        v = testObject.value
+        self.assertEqual(v, 42)
+        self.assertEqual(testObject.changed_emitted, 1)
+        self.assertEqual(testObject.setter_called, 1)
+        self.assertEqual(testObject.getter_called, 2)
+
+    def test2DerivedObject(self):
+        """PYSIDE-1255: Run the same test for a class inheriting QObject."""
+        testObject = TestDerivedObject()
+        v = testObject.value
+        self.assertEqual(v, -1)
+        self.assertEqual(testObject.getter_called, 1)
+        testObject.value = 42
+        v = testObject.value
+        self.assertEqual(v, 42)
+        self.assertEqual(testObject.changed_emitted, 1)
+        self.assertEqual(testObject.setter_called, 1)
+        self.assertEqual(testObject.getter_called, 2)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 4566ed3bc..2d546cadd 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1613,9 +1613,22 @@ AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFu
 AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFunctionPtr &addedFunc,
                                                                    AbstractMetaClass *metaClass)
 {
-    auto *metaFunction = new AbstractMetaFunction(addedFunc);
-    metaFunction->setType(translateType(addedFunc->returnType()));
+    QString errorMessage;
 
+    AbstractMetaType *returnType = nullptr;
+    if (addedFunc->returnType().name != QLatin1String("void")) {
+        returnType = translateType(addedFunc->returnType(), &errorMessage);
+        if (!returnType) {
+            qCWarning(lcShiboken, "%s",
+                      qPrintable(msgAddedFunctionInvalidReturnType(addedFunc->name(),
+                                                                   addedFunc->returnType().name,
+                                                                   errorMessage)));
+            return nullptr;
+        }
+    }
+
+    auto metaFunction = new AbstractMetaFunction(addedFunc);
+    metaFunction->setType(returnType);
 
     const auto &args = addedFunc->arguments();
     AbstractMetaArgumentList metaArguments;
@@ -1623,11 +1636,12 @@ AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFu
     for (int i = 0; i < args.count(); ++i) {
         const AddedFunction::TypeInfo& typeInfo = args.at(i).typeInfo;
         auto *metaArg = new AbstractMetaArgument;
-        AbstractMetaType *type = translateType(typeInfo);
+        AbstractMetaType *type = translateType(typeInfo, &errorMessage);
         if (Q_UNLIKELY(!type)) {
-            qCWarning(lcShiboken,
-                      "Unable to translate type \"%s\" of argument %d of added function \"%s\".",
-                      qPrintable(typeInfo.name), i + 1, qPrintable(addedFunc->name()));
+            qCWarning(lcShiboken, "%s",
+                      qPrintable(msgAddedFunctionInvalidArgType(addedFunc->name(),
+                                                                typeInfo.name, i + 1,
+                                                                errorMessage)));
             delete metaFunction;
             return nullptr;
         }
@@ -2041,7 +2055,8 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio
     return metaFunction;
 }
 
-AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction::TypeInfo &typeInfo)
+AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction::TypeInfo &typeInfo,
+                                                            QString *errorMessage)
 {
     Q_ASSERT(!typeInfo.name.isEmpty());
     TypeDatabase* typeDb = TypeDatabase::instance();
@@ -2053,6 +2068,8 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
         return nullptr;
 
     type = typeDb->findType(typeName);
+    if (!type)
+        type = typeDb->findFlagsType(typeName);
 
     // test if the type is a template, like a container
     bool isTemplate = false;
@@ -2060,12 +2077,11 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
     if (!type && typeInfo.name.contains(QLatin1Char('<'))) {
         const QStringList& parsedType = parseTemplateType(typeInfo.name);
         if (parsedType.isEmpty()) {
-            qCWarning(lcShiboken).noquote().nospace()
-                << QStringLiteral("Template type parsing failed for '%1'").arg(typeInfo.name);
-        } else {
-            templateArgs = parsedType.mid(1);
-            isTemplate = (type = typeDb->findContainerType(parsedType[0]));
+            *errorMessage = QStringLiteral("Template type parsing failed for '%1'").arg(typeInfo.name);
+            return nullptr;
         }
+        templateArgs = parsedType.mid(1);
+        isTemplate = (type = typeDb->findContainerType(parsedType[0]));
     }
 
     if (!type) {
@@ -2076,20 +2092,18 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
             if (it.key().endsWith(colonColon() + typeName))
                 candidates.append(it.key());
         }
-
-        QString msg = QStringLiteral("Type '%1' wasn't found in the type database.\n").arg(typeName);
+        QTextStream str(errorMessage);
+        str << "Type '" << typeName << "' wasn't found in the type database.\n";
 
         if (candidates.isEmpty()) {
-            qFatal("%sDeclare it in the type system using the proper <*-type> tag.",
-                   qPrintable(msg));
-        }
-
-        msg += QLatin1String("Remember to inform the full qualified name for the type you want to use.\nCandidates are:\n");
-        candidates.sort();
-        for (const QString& candidate : qAsConst(candidates)) {
-            msg += QLatin1String("    ") + candidate + QLatin1Char('\n');
+            str << "Declare it in the type system using the proper <*-type> tag.";
+        } else {
+            str << "Remember to inform the full qualified name for the type you want to use.\nCandidates are:\n";
+            candidates.sort();
+            for (const QString& candidate : qAsConst(candidates))
+                str << "    " << candidate << '\n';
         }
-        qFatal("%s", qPrintable(msg));
+        return nullptr;
     }
 
     auto *metaType = new AbstractMetaType;
@@ -2100,7 +2114,12 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
     metaType->setConstant(typeInfo.isConstant);
     if (isTemplate) {
         for (const QString& templateArg : qAsConst(templateArgs)) {
-            AbstractMetaType *metaArgType = translateType(AddedFunction::TypeInfo::fromSignature(templateArg));
+            AbstractMetaType *metaArgType = nullptr;
+            if (templateArg != QLatin1String("void")) {
+                metaArgType = translateType(AddedFunction::TypeInfo::fromSignature(templateArg), errorMessage);
+                if (!metaArgType)
+                    return nullptr;
+            }
             metaType->addInstantiation(metaArgType);
         }
         metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern);
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index b381a62cd..be73697f0 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -136,7 +136,8 @@ public:
     QString fixDefaultValue(const ArgumentModelItem &item, AbstractMetaType *type,
                             AbstractMetaFunction *fnc, AbstractMetaClass *,
                             int argumentIndex);
-    AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo);
+    AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo,
+                                    QString *errorMessage);
     AbstractMetaType *translateType(const TypeInfo &type,
                                     AbstractMetaClass *currentClass,
                                     TranslateTypeFlags flags = {},
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 0ce7df00a..ad694eb4f 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -1582,7 +1582,7 @@ void AbstractMetaClass::addFunction(AbstractMetaFunction *function)
     else
         Q_ASSERT(false); //memory leak
 
-    m_hasVirtuals |= function->isVirtual() || hasVirtualDestructor();
+    m_hasVirtuals |= function->isVirtual();
     m_isPolymorphic |= m_hasVirtuals;
     m_hasNonpublic |= !function->isPublic();
 }
@@ -2019,6 +2019,13 @@ void AbstractMetaClass::addDefaultCopyConstructor(bool isPrivate)
     addFunction(f);
 }
 
+void AbstractMetaClass::setHasVirtualDestructor(bool value)
+{
+    m_hasVirtualDestructor = value;
+    if (value)
+        m_hasVirtuals = m_isPolymorphic = 1;
+}
+
 bool AbstractMetaClass::hasFunction(const AbstractMetaFunction *f) const
 {
     return functions_contains(m_functions, f);
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 2ae1b6d21..166e7d0cb 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -1374,10 +1374,7 @@ public:
         return m_hasVirtualDestructor;
     }
 
-    void setHasVirtualDestructor(bool value)
-    {
-        m_hasVirtualDestructor = value;
-    }
+    void setHasVirtualDestructor(bool value);
 
     bool isConstructible() const
     {
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index d3e5e212f..188725da9 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -274,7 +274,7 @@ static QString findClangBuiltInIncludesDir()
         for (const QFileInfo &fi : versionDirs) {
             const QString fileName = fi.fileName();
             if (fileName.at(0).isDigit()) {
-                const QVersionNumber versionNumber = QVersionNumber::fromString(fileName.at(0));
+                const QVersionNumber versionNumber = QVersionNumber::fromString(fileName);
                 if (!versionNumber.isNull() && versionNumber > lastVersionNumber) {
                     candidate = fi.absoluteFilePath();
                     lastVersionNumber = versionNumber;
diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp
index 546e9c4ed..0eb3c607f 100644
--- a/sources/shiboken2/ApiExtractor/messages.cpp
+++ b/sources/shiboken2/ApiExtractor/messages.cpp
@@ -107,6 +107,28 @@ static void msgFormatEnumType(Stream &str,
         str << " (class: " << className << ')';
 }
 
+QString msgAddedFunctionInvalidArgType(const QString &addedFuncName,
+                                       const QString &typeName,
+                                       int pos, const QString &why)
+{
+    QString result;
+    QTextStream str(&result);
+    str << "Unable to translate type \"" << typeName  << "\" of argument "
+        << pos << " of added function \"" << addedFuncName << "\": " << why;
+    return result;
+}
+
+QString msgAddedFunctionInvalidReturnType(const QString &addedFuncName,
+                                          const QString &typeName, const QString &why)
+{
+    QString result;
+    QTextStream str(&result);
+    str << "Unable to translate return type \"" <<  typeName
+        << "\" of added function \"" << addedFuncName << "\": "
+        << why;
+    return result;
+}
+
 QString msgNoEnumTypeEntry(const EnumModelItem &enumItem,
                            const QString &className)
 {
diff --git a/sources/shiboken2/ApiExtractor/messages.h b/sources/shiboken2/ApiExtractor/messages.h
index 2b7b75ba0..ad0553fbc 100644
--- a/sources/shiboken2/ApiExtractor/messages.h
+++ b/sources/shiboken2/ApiExtractor/messages.h
@@ -45,6 +45,13 @@ QT_FORWARD_DECLARE_CLASS(QDir)
 QT_FORWARD_DECLARE_CLASS(QFile)
 QT_FORWARD_DECLARE_CLASS(QXmlStreamReader)
 
+QString msgAddedFunctionInvalidArgType(const QString &addedFuncName,
+                                       const QString &typeName,
+                                       int pos, const QString &why);
+
+QString msgAddedFunctionInvalidReturnType(const QString &addedFuncName,
+                                          const QString &typeName, const QString &why);
+
 QString msgNoFunctionForModification(const QString &signature,
                                      const QString &originalSignature,
                                      const QString &className,
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
index b85a022b3..f2e15fdb0 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
@@ -195,6 +195,33 @@ public:
     QCOMPARE(funcC->implementingClass(), c);
 }
 
+void TestAbstractMetaClass::testVirtualBase()
+{
+    const char cppCode[] =R"CPP(
+class Base {
+public:
+    virtual ~Base() = default;
+};
+class Derived : public Base {};
+)CPP";
+
+    const char xmlCode[] = R"XML(
+<typesystem package="Foo">
+    <object-type name='Base'/>
+    <object-type name='Derived'/>
+</typesystem>
+)XML";
+    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
+    QVERIFY(!builder.isNull());
+    AbstractMetaClassList classes = builder->classes();
+    auto base = AbstractMetaClass::findClass(classes, QLatin1String("Base"));
+    QVERIFY(base);
+    QVERIFY(base->isPolymorphic());
+    auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived"));
+    QVERIFY(derived);
+    QVERIFY(derived->isPolymorphic());
+}
+
 void TestAbstractMetaClass::testDefaultValues()
 {
     const char* cppCode ="\
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h
index cb0b6693e..e19973625 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h
+++ b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h
@@ -40,6 +40,7 @@ private slots:
     void testClassName();
     void testClassNameUnderNamespace();
     void testVirtualMethods();
+    void testVirtualBase();
     void testDefaultValues();
     void testModifiedDefaultValues();
     void testInnerClassOfAPolymorphicOne();
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index 8d8d60f3f..4d0a23ca1 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1219,8 +1219,7 @@ class ComplexTypeEntry : public TypeEntry
 {
 public:
     enum TypeFlag {
-        Deprecated         = 0x4,
-        NoOverrideCaching  = 0x8
+        Deprecated         = 0x4
     };
     Q_DECLARE_FLAGS(TypeFlags, TypeFlag)
 
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
index 5252ac00a..0bb56f0fe 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
@@ -60,7 +60,6 @@ static inline QString untilAttribute() { return QStringLiteral("until"); }
 static inline QString defaultSuperclassAttribute() { return QStringLiteral("default-superclass"); }
 static inline QString deleteInMainThreadAttribute() { return QStringLiteral("delete-in-main-thread"); }
 static inline QString deprecatedAttribute() { return QStringLiteral("deprecated"); }
-static inline QString noOverrideCachingAttribute() { return QStringLiteral("no-override-caching"); }
 static inline QString exceptionHandlingAttribute() { return QStringLiteral("exception-handling"); }
 static inline QString extensibleAttribute() { return QStringLiteral("extensible"); }
 static inline QString flagsAttribute() { return QStringLiteral("flags"); }
@@ -1477,9 +1476,6 @@ void TypeSystemParser::applyComplexTypeAttributes(const QXmlStreamReader &reader
         } else if (name == deprecatedAttribute()) {
             if (convertBoolean(attributes->takeAt(i).value(), deprecatedAttribute(), false))
                 ctype->setTypeFlags(ctype->typeFlags() | ComplexTypeEntry::Deprecated);
-       } else if (name == noOverrideCachingAttribute()) {
-            if (convertBoolean(attributes->takeAt(i).value(), noOverrideCachingAttribute(), false))
-                ctype->setTypeFlags(ctype->typeFlags() | ComplexTypeEntry::NoOverrideCaching);
         } else if (name == deleteInMainThreadAttribute()) {
             if (convertBoolean(attributes->takeAt(i).value(), deleteInMainThreadAttribute(), false))
                 ctype->setDeleteInMainThread(true);
diff --git a/sources/shiboken2/doc/gettingstarted.rst b/sources/shiboken2/doc/gettingstarted.rst
index e064cec5d..caeb5a909 100644
--- a/sources/shiboken2/doc/gettingstarted.rst
+++ b/sources/shiboken2/doc/gettingstarted.rst
@@ -28,9 +28,9 @@ If you need only Shiboken Generator, a simple build run would look like this::
                             --build-tests \
                             --parallel=8 \
                             --verbose-build \
-                            --internal-build=shiboken2-generator
+                            --internal-build-type=shiboken2-generator
 
-The same can be used for the module, changing the value of ``internal-build`` to
+The same can be used for the module, changing the value of ``internal-build-type`` to
 ``shiboken2-module``.
 
 Using the wheels
diff --git a/sources/shiboken2/doc/typesystem_specifying_types.rst b/sources/shiboken2/doc/typesystem_specifying_types.rst
index 3ab6adbd6..bca1e0774 100644
--- a/sources/shiboken2/doc/typesystem_specifying_types.rst
+++ b/sources/shiboken2/doc/typesystem_specifying_types.rst
@@ -300,7 +300,6 @@ object-type
              allow-thread="..."
              exception-handling="..."
              hash-function="..."
-             no-override-caching="yes | no"
              stream="yes | no"
              revision="..." />
         </typesystem>
@@ -324,10 +323,6 @@ object-type
     specify the default handling for the corresponding function modification
     (see :ref:`modify-function`).
 
-    The *optional* attribute **no-override-caching** can be used to turn off the
-    caching of methods overridden in Python, which can trigger obscure bugs when
-    setting attributes in Python 2.
-
 interface-type
 ^^^^^^^^^^^^^^
 
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index fbd3c314b..2cdb8870c 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -2202,9 +2202,7 @@ bool ShibokenGenerator::injectedCodeUsesArgument(const AbstractMetaFunction *fun
 
 bool ShibokenGenerator::useOverrideCaching(const AbstractMetaClass *metaClass)
 {
-    return metaClass->isPolymorphic()
-        && !metaClass->typeEntry()->typeFlags().testFlag(ComplexTypeEntry::NoOverrideCaching);
-
+    return metaClass->isPolymorphic();
 }
 
 ShibokenGenerator::AttroCheck ShibokenGenerator::checkAttroFunctionNeeds(const AbstractMetaClass *metaClass) const
@@ -2219,6 +2217,13 @@ ShibokenGenerator::AttroCheck ShibokenGenerator::checkAttroFunctionNeeds(const A
             result |= AttroCheckFlag::SetattroQObject;
         if (useOverrideCaching(metaClass))
             result |= AttroCheckFlag::SetattroMethodOverride;
+        // PYSIDE-1255: If setattro is generated for a class inheriting
+        // QObject, the property code needs to be generated, too.
+        if ((result & AttroCheckFlag::SetattroMask) != 0
+            && !result.testFlag(AttroCheckFlag::SetattroQObject)
+            && metaClass->isQObject()) {
+            result |= AttroCheckFlag::SetattroQObject;
+        }
     }
     return result;
 }
diff --git a/sources/shiboken2/libshiboken/bufferprocs_py37.cpp b/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
index ddb07390e..da6bb00a3 100644
--- a/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
+++ b/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
@@ -47,7 +47,7 @@
 
 #ifdef Py_LIMITED_API
 
-#include "pep384impl.h"
+#include "sbkpython.h"
 /* Buffer C-API for Python 3.0 */
 
 int
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
index c7ca98c46..c04848eb3 100644
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
+++ b/sources/shiboken2/libshiboken/pep384impl.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "pep384impl.h"
+#include "sbkpython.h"
 #include "autodecref.h"
 #include "sbkstaticstrings.h"
 #include "sbkstaticstrings_p.h"
@@ -50,26 +50,19 @@ extern "C"
 /*
  * The documentation is located in pep384impl_doc.rst
  */
-
-/*****************************************************************************
- *
- * Support for object.h
- *
- */
-
+#if PY_VERSION_HEX < 0x03000000
+#define IS_PY2
+#endif // PY_VERSION_HEX < 0x03000000
 /*
  * Here is the verification code for PyTypeObject.
  * We create a type object and check if its fields
  * appear at the right offsets.
  */
+#ifdef Py_LIMITED_API
 
 #define make_dummy_int(x)   (x * sizeof(void *))
 #define make_dummy(x)       (reinterpret_cast<void *>(make_dummy_int(x)))
 
-#ifdef Py_LIMITED_API
-datetime_struc *PyDateTimeAPI = NULL;
-#endif
-
 static PyObject *
 dummy_func(PyObject * /* self */, PyObject * /* args */)
 {
@@ -180,18 +173,18 @@ check_PyTypeObject_valid()
     Py_DECREF(probe_tp_mro);
 }
 
-
-#ifdef Py_LIMITED_API
-
 #if PY_VERSION_HEX < PY_ISSUE33738_SOLVED
 #include "pep384_issue33738.cpp"
 #endif
 
+#endif // Py_LIMITED_API
+
 /*****************************************************************************
  *
  * Support for unicodeobject.h
  *
  */
+#ifdef Py_LIMITED_API
 
 char *
 _PepUnicode_AsString(PyObject *str)
@@ -207,15 +200,15 @@ _PepUnicode_AsString(PyObject *str)
 #define TOSTRING(x) STRINGIFY(x)
 #define AT __FILE__ ":" TOSTRING(__LINE__)
 
-    static PyObject *cstring_dict = NULL;
-    if (cstring_dict == NULL) {
+    static PyObject *cstring_dict = nullptr;
+    if (cstring_dict == nullptr) {
         cstring_dict = PyDict_New();
-        if (cstring_dict == NULL)
+        if (cstring_dict == nullptr)
             Py_FatalError("Error in " AT);
     }
-    PyObject *bytesStr = PyUnicode_AsEncodedString(str, "utf8", NULL);
-    PyObject *entry = PyDict_GetItem(cstring_dict, bytesStr);
-    if (entry == NULL) {
+    PyObject *bytesStr = PyUnicode_AsEncodedString(str, "utf8", nullptr);
+    PyObject *entry = PyDict_GetItemWithError(cstring_dict, bytesStr);
+    if (entry == nullptr) {
         int e = PyDict_SetItem(cstring_dict, bytesStr, bytesStr);
         if (e != 0)
             Py_FatalError("Error in " AT);
@@ -225,12 +218,14 @@ _PepUnicode_AsString(PyObject *str)
         Py_DECREF(bytesStr);
     return PyBytes_AsString(entry);
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for longobject.h
  *
  */
+#ifdef Py_LIMITED_API
 
 /*
  * This is the original Python function _PyLong_AsInt() from longobject.c .
@@ -253,15 +248,18 @@ _PepLong_AsInt(PyObject *obj)
                         "Python int too large to convert to C int");
         return -1;
     }
-    return (int)result;
+    return int(result);
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for pydebug.h
  *
  */
-static PyObject *sys_flags = NULL;
+#ifdef Py_LIMITED_API
+
+static PyObject *sys_flags = nullptr;
 
 int
 Pep_GetFlag(const char *name)
@@ -271,13 +269,13 @@ Pep_GetFlag(const char *name)
 
     if (!initialized) {
         sys_flags = PySys_GetObject("flags");
-        // func gives no error if NULL is returned and does not incref.
+        // func gives no error if nullptr is returned and does not incref.
         Py_XINCREF(sys_flags);
         initialized = 1;
     }
-    if (sys_flags != NULL) {
+    if (sys_flags != nullptr) {
         PyObject *ob_ret = PyObject_GetAttrString(sys_flags, name);
-        if (ob_ret != NULL) {
+        if (ob_ret != nullptr) {
             long long_ret = PyLong_AsLong(ob_ret);
             Py_DECREF(ob_ret);
             ret = (int) long_ret;
@@ -299,12 +297,14 @@ Pep_GetVerboseFlag()
     }
     return verbose_flag;
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for code.h
  *
  */
+#ifdef Py_LIMITED_API
 
 int
 PepCode_Get(PyCodeObject *co, const char *name)
@@ -314,28 +314,32 @@ PepCode_Get(PyCodeObject *co, const char *name)
     int ret = -1;
 
     ob_ret = PyObject_GetAttrString(ob, name);
-    if (ob_ret != NULL) {
+    if (ob_ret != nullptr) {
         long long_ret = PyLong_AsLong(ob_ret);
         Py_DECREF(ob_ret);
         ret = (int) long_ret;
     }
     return ret;
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for datetime.h
  *
  */
+#ifdef Py_LIMITED_API
+
+datetime_struc *PyDateTimeAPI = nullptr;
 
 static PyTypeObject *dt_getCheck(const char *name)
 {
     PyObject *op = PyObject_GetAttrString(PyDateTimeAPI->module, name);
-    if (op == NULL) {
+    if (op == nullptr) {
         fprintf(stderr, "datetime.%s not found\n", name);
         Py_FatalError("aborting");
     }
-    return (PyTypeObject *)op;
+    return reinterpret_cast<PyTypeObject *>(op);
 }
 
 // init_DateTime is called earlier than our module init.
@@ -346,10 +350,10 @@ init_DateTime(void)
     static int initialized = 0;
     if (!initialized) {
         PyDateTimeAPI = (datetime_struc *)malloc(sizeof(datetime_struc));
-        if (PyDateTimeAPI == NULL)
+        if (PyDateTimeAPI == nullptr)
             Py_FatalError("PyDateTimeAPI malloc error, aborting");
         PyDateTimeAPI->module = PyImport_ImportModule("datetime");
-        if (PyDateTimeAPI->module == NULL)
+        if (PyDateTimeAPI->module == nullptr)
             Py_FatalError("datetime module not found, aborting");
         PyDateTimeAPI->DateType     = dt_getCheck("date");
         PyDateTimeAPI->DateTimeType = dt_getCheck("datetime");
@@ -368,7 +372,7 @@ PyDateTime_Get(PyObject *ob, const char *name)
     int ret = -1;
 
     ob_ret = PyObject_GetAttrString(ob, name);
-    if (ob_ret != NULL) {
+    if (ob_ret != nullptr) {
         long long_ret = PyLong_AsLong(ob_ret);
         Py_DECREF(ob_ret);
         ret = (int) long_ret;
@@ -398,21 +402,23 @@ PyTime_FromTime(int hour, int min, int sec, int usec)
     return PyObject_CallFunction((PyObject *)PyDateTimeAPI->TimeType,
                                  (char *)"(iiii)", hour, min, sec, usec);
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for pythonrun.h
  *
  */
+#ifdef Py_LIMITED_API
 
 // Flags are ignored in these simple helpers.
 PyObject *
 PyRun_String(const char *str, int start, PyObject *globals, PyObject *locals)
 {
     PyObject *code = Py_CompileString(str, "pyscript", start);
-    PyObject *ret = NULL;
+    PyObject *ret = nullptr;
 
-    if (code != NULL) {
+    if (code != nullptr) {
         ret = PyEval_EvalCode(code, globals, locals);
     }
     Py_XDECREF(code);
@@ -423,9 +429,9 @@ PyRun_String(const char *str, int start, PyObject *globals, PyObject *locals)
 
 // This is only a simple local helper that returns a computed variable.
 // Used also in Python 2.
-#if defined(Py_LIMITED_API) || PY_VERSION_HEX < 0x03000000
+#if defined(Py_LIMITED_API) || defined(IS_PY2)
 static PyObject *
-PepRun_GetResult(const char *command, const char *resvar)
+PepRun_GetResult(const char *command)
 {
     PyObject *d, *v, *res;
 
@@ -435,30 +441,29 @@ PepRun_GetResult(const char *command, const char *resvar)
         return nullptr;
     }
     v = PyRun_String(command, Py_file_input, d, d);
-    res = v ? PyDict_GetItemString(d, resvar) : NULL;
+    res = v ? PyDict_GetItem(d, Shiboken::PyName::result()) : nullptr;
     Py_XDECREF(v);
     Py_DECREF(d);
     return res;
 }
-#endif // Py_LIMITED_API || Python 2
-
-#ifdef Py_LIMITED_API
+#endif // defined(Py_LIMITED_API) || defined(IS_PY2)
 
 /*****************************************************************************
  *
  * Support for classobject.h
  *
  */
+#ifdef Py_LIMITED_API
 
-PyTypeObject *PepMethod_TypePtr = NULL;
+PyTypeObject *PepMethod_TypePtr = nullptr;
 
 static PyTypeObject *getMethodType(void)
 {
     static const char prog[] =
         "class _C:\n"
         "    def _m(self): pass\n"
-        "MethodType = type(_C()._m)\n";
-    return (PyTypeObject *) PepRun_GetResult(prog, "MethodType");
+        "result = type(_C()._m)\n";
+    return reinterpret_cast<PyTypeObject *>(PepRun_GetResult(prog));
 }
 
 // We have no access to PyMethod_New and must call types.MethodType, instead.
@@ -489,12 +494,14 @@ PyMethod_Self(PyObject *im)
     Py_DECREF(ret);
     return ret;
 }
+#endif // Py_LIMITED_API
 
 /*****************************************************************************
  *
  * Support for funcobject.h
  *
  */
+#ifdef Py_LIMITED_API
 
 PyObject *
 PepFunction_Get(PyObject *ob, const char *name)
@@ -509,22 +516,64 @@ PepFunction_Get(PyObject *ob, const char *name)
 
 // This became necessary after Windows was activated.
 
-PyTypeObject *PepFunction_TypePtr = NULL;
+PyTypeObject *PepFunction_TypePtr = nullptr;
 
 static PyTypeObject *getFunctionType(void)
 {
     static const char prog[] =
-        "from types import FunctionType\n";
-    return (PyTypeObject *) PepRun_GetResult(prog, "FunctionType");
+        "from types import FunctionType as result\n";
+    return reinterpret_cast<PyTypeObject *>(PepRun_GetResult(prog));
 }
+#endif // Py_LIMITED_API || Python 2
+
+/*****************************************************************************
+ *
+ * Support for dictobject.h
+ *
+ */
+
+// PYSIDE-803, PYSIDE-813: We need that GIL-free version from Python 2.7.12 .
+#ifdef IS_PY2
+
+/* Variant of PyDict_GetItem() that doesn't suppress exceptions.
+   This returns NULL *with* an exception set if an exception occurred.
+   It returns NULL *without* an exception set if the key wasn't present.
+*/
+PyObject *
+PyDict_GetItemWithError(PyObject *op, PyObject *key)
+{
+    long hash;
+    PyDictObject *mp = reinterpret_cast<PyDictObject *>(op);
+    PyDictEntry *ep;
+    if (!PyDict_Check(op)) {
+        PyErr_BadInternalCall();
+        return nullptr;
+    }
+    if (!PyString_CheckExact(key) ||
+        (hash = (reinterpret_cast<PyStringObject *>(key))->ob_shash) == -1)
+    {
+        hash = PyObject_Hash(key);
+        if (hash == -1) {
+            return nullptr;
+        }
+    }
+
+    ep = (mp->ma_lookup)(mp, key, hash);
+    if (ep == nullptr) {
+        return nullptr;
+    }
+    return ep->me_value;
+}
+#endif // IS_PY2
 
 /*****************************************************************************
  *
  * Extra support for signature.cpp
  *
  */
+#ifdef Py_LIMITED_API
 
-PyTypeObject *PepStaticMethod_TypePtr = NULL;
+PyTypeObject *PepStaticMethod_TypePtr = nullptr;
 
 static PyTypeObject *
 getStaticMethodType(void)
@@ -533,8 +582,8 @@ getStaticMethodType(void)
     //    "StaticMethodType = type(str.__dict__['maketrans'])\n";
     static const char prog[] =
         "from xxsubtype import spamlist\n"
-        "StaticMethod_Type = type(spamlist.__dict__['staticmeth'])\n";
-    return (PyTypeObject *) PepRun_GetResult(prog, "StaticMethod_Type");
+        "result = type(spamlist.__dict__['staticmeth'])\n";
+    return reinterpret_cast<PyTypeObject *>(PepRun_GetResult(prog));
 }
 
 typedef struct {
@@ -548,25 +597,25 @@ PyStaticMethod_New(PyObject *callable)
 {
     staticmethod *sm = (staticmethod *)
         PyType_GenericAlloc(PepStaticMethod_TypePtr, 0);
-    if (sm != NULL) {
+    if (sm != nullptr) {
         Py_INCREF(callable);
         sm->sm_callable = callable;
     }
-    return (PyObject *)sm;
+    return reinterpret_cast<PyObject *>(sm);
 }
 #endif // Py_LIMITED_API
 
-#if PY_VERSION_HEX < 0x03000000
-PyTypeObject *PepMethodDescr_TypePtr = NULL;
+#ifdef IS_PY2
+PyTypeObject *PepMethodDescr_TypePtr = nullptr;
 
 static PyTypeObject *
 getMethodDescrType(void)
 {
     static const char prog[] =
-        "MethodDescr_Type = type(str.split)\n";
-    return (PyTypeObject *) PepRun_GetResult(prog, "MethodDescr_Type");
+        "result = type(str.split)\n";
+    return reinterpret_cast<PyTypeObject *>(PepRun_GetResult(prog));
 }
-#endif
+#endif // IS_PY2
 
 /*****************************************************************************
  *
@@ -595,9 +644,9 @@ PepType_GetNameStr(PyTypeObject *type)
 
 #ifdef Py_LIMITED_API
 // We keep these definitions local, because they don't work in Python 2.
-#define PyUnicode_GET_LENGTH(op)    PyUnicode_GetLength((PyObject *)(op))
-#define PyUnicode_READ_CHAR(u, i)   PyUnicode_ReadChar((PyObject *)(u), (i))
-#endif
+# define PyUnicode_GET_LENGTH(op)    PyUnicode_GetLength((PyObject *)(op))
+# define PyUnicode_READ_CHAR(u, i)   PyUnicode_ReadChar((PyObject *)(u), (i))
+#endif // Py_LIMITED_API
 
 PyObject *
 _Pep_PrivateMangle(PyObject *self, PyObject *name)
@@ -607,9 +656,9 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
      * This function is modelled after _Py_Mangle, but is optimized
      * a little for our purpose.
      */
-#if PY_VERSION_HEX < 0X03000000
+#ifdef IS_PY2
     const char *namestr = PyString_AsString(name);
-    if (namestr == NULL || namestr[0] != '_' || namestr[1] != '_') {
+    if (namestr == nullptr || namestr[0] != '_' || namestr[1] != '_') {
         Py_INCREF(name);
         return name;
     }
@@ -634,7 +683,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
         Py_INCREF(name);
         return name;
     }
-#endif
+#endif // IS_PY2
     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
 #ifndef Py_LIMITED_API
@@ -655,7 +704,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
     if (plen + nlen >= PY_SSIZE_T_MAX - 1) {
         PyErr_SetString(PyExc_OverflowError,
                         "private identifier too large to be mangled");
-        return NULL;
+        return nullptr;
     }
     size_t const amount = ipriv + 1 + plen + nlen;
     size_t const big_stack = 1000;
@@ -673,7 +722,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
     if (amount > big_stack)
         free(resbuf);
     return result;
-#endif  // Py_LIMITED_API
+#endif // else Py_LIMITED_API
 }
 
 /*****************************************************************************
@@ -704,17 +753,18 @@ init_PepRuntime()
 void
 Pep384_Init()
 {
-    check_PyTypeObject_valid();
     init_PepRuntime();
 #ifdef Py_LIMITED_API
+    check_PyTypeObject_valid();
     Pep_GetVerboseFlag();
     PepMethod_TypePtr = getMethodType();
     PepFunction_TypePtr = getFunctionType();
     PepStaticMethod_TypePtr = getStaticMethodType();
-#endif
-#if PY_VERSION_HEX < 0x03000000
+#endif // Py_LIMITED_API
+
+#ifdef IS_PY2
     PepMethodDescr_TypePtr = getMethodDescrType();
-#endif
+#endif // IS_PY2
 }
 
 } // extern "C"
diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
index 6d0fa2450..e735095e8 100644
--- a/sources/shiboken2/libshiboken/pep384impl.h
+++ b/sources/shiboken2/libshiboken/pep384impl.h
@@ -40,8 +40,6 @@
 #ifndef PEP384IMPL_H
 #define PEP384IMPL_H
 
-#include "sbkpython.h"
-
 extern "C"
 {
 
@@ -204,17 +202,36 @@ LIBSHIBOKEN_API int Pep_GetVerboseFlag(void);
  * RESOLVED: unicodeobject.h
  *
  */
-#ifdef Py_LIMITED_API
-
-LIBSHIBOKEN_API char *_PepUnicode_AsString(PyObject *);
 
+///////////////////////////////////////////////////////////////////////
+//
+// PYSIDE-813: About The Length Of Unicode Objects
+// -----------------------------------------------
+//
+// In Python 2 and before Python 3.3, the macro PyUnicode_GET_SIZE
+// worked fine and really like a macro.
+//
+// Meanwhile, the unicode objects have changed their layout very much,
+// and the former cheap macro call has become a real function call
+// that converts objects and needs PyMemory.
+//
+// That is not only inefficient, but also requires the GIL!
+// This problem was visible by debug Python and qdatastream_test.py .
+// It was found while fixing the refcount problem of PYSIDE-813 which
+// needed a debug Python.
+//
+
+// PyUnicode_GetSize is deprecated in favor of PyUnicode_GetLength.
 #if PY_VERSION_HEX < 0x03000000
-#define PyUnicode_GET_SIZE(op)      PyUnicode_GetSize((PyObject *)(op))
+#define PepUnicode_GetLength(op)    PyUnicode_GetSize((PyObject *)(op))
 #else
-// PyUnicode_GetSize is deprecated in favor of PyUnicode_GetLength
-#define PyUnicode_GET_SIZE(op)      PyUnicode_GetLength((PyObject *)(op))
+#define PepUnicode_GetLength(op)    PyUnicode_GetLength((PyObject *)(op))
 #endif
 
+#ifdef Py_LIMITED_API
+
+LIBSHIBOKEN_API char *_PepUnicode_AsString(PyObject *);
+
 #else
 #define _PepUnicode_AsString     PyUnicode_AsUTF8
 #endif
@@ -262,6 +279,17 @@ LIBSHIBOKEN_API char *_PepUnicode_AsString(PyObject *);
 
 /*****************************************************************************
  *
+ * RESOLVED: dictobject.h
+ *
+ * PYSIDE-803, PYSIDE-813: We need PyDict_GetItemWithError in order to
+ *                         avoid the GIL.
+ */
+#if PY_VERSION_HEX < 0x03000000
+LIBSHIBOKEN_API PyObject *PyDict_GetItemWithError(PyObject *mp, PyObject *key);
+#endif
+
+/*****************************************************************************
+ *
  * RESOLVED: methodobject.h
  *
  */
diff --git a/sources/shiboken2/libshiboken/pep384impl_doc.rst b/sources/shiboken2/libshiboken/pep384impl_doc.rst
index 2f3b7ea97..d8ebdbe70 100644
--- a/sources/shiboken2/libshiboken/pep384impl_doc.rst
+++ b/sources/shiboken2/libshiboken/pep384impl_doc.rst
@@ -70,8 +70,10 @@ supported. We redefined it as macro ``Py_VerboseFlag`` which calls ``Pep_Verbose
 unicodeobject.h
 ---------------
 
-The macro ``PyUnicode_GET_SIZE`` was redefined to call into ``PyUnicode_GetSize``
-for Python 2, and ``PyUnicode_GetLength`` for Python 3.
+The macro ``PyUnicode_GET_SIZE`` was removed and replaced by ``PepUnicode_GetLength``
+which evaluates to ``PyUnicode_GetSize`` for Python 2 and ``PyUnicode_GetLength`` for Python 3.
+Since Python 3.3, ``PyUnicode_GetSize`` would have the bad side effect of requiring the GIL!
+
 Function ``_PyUnicode_AsString`` is unavailable and was replaced by a macro
 that calls ``_PepUnicode_AsString``. The implementation was a bit involved,
 and it would be better to change the code and replace this function.
@@ -104,6 +106,16 @@ listobject.h
 function calls.
 
 
+dictobject.h
+------------
+
+``PyDict_GetItem`` also exists in a ``PyDict_GetItemWithError`` version that does
+not suppress errors. This suppression has the side effect of touching global
+structures. This function exists in Python 2 only since Python 2.7.12 and has
+a different name. We simply implemented the function.
+Needed to avoid the GIL when accessing dictionaries.
+
+
 methodobject.h
 --------------
 
diff --git a/sources/shiboken2/libshiboken/sbkpython.h b/sources/shiboken2/libshiboken/sbkpython.h
index f06b0b19e..9dd1e712e 100644
--- a/sources/shiboken2/libshiboken/sbkpython.h
+++ b/sources/shiboken2/libshiboken/sbkpython.h
@@ -72,6 +72,7 @@ extern "C" {
 // Now we have the usual variables from Python.h .
 #  include "python25compat.h"
 #  include "shibokenmacros.h"
+// "pep384impl.h" may nowhere be included but in this file.
 #  include "pep384impl.h"
 #  include "typespec.h"
 #  pragma pop_macro("slots")
@@ -98,6 +99,7 @@ extern "C" {
 // Now we have the usual variables from Python.h .
 #  include "python25compat.h"
 #  include "shibokenmacros.h"
+// "pep384impl.h" may nowhere be included but in this file.
 #  include "pep384impl.h"
 #  include "typespec.h"
 #endif
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
index 42d20d133..04069a4d1 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
+++ b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
@@ -54,6 +54,7 @@ namespace PyName {
 // exported:
 STATIC_STRING_IMPL(dumps, "dumps")
 STATIC_STRING_IMPL(loads, "loads")
+STATIC_STRING_IMPL(result, "result")
 
 // Internal:
 STATIC_STRING_IMPL(classmethod, "classmethod")
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.h b/sources/shiboken2/libshiboken/sbkstaticstrings.h
index fa21a8e2c..6016fe106 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.h
+++ b/sources/shiboken2/libshiboken/sbkstaticstrings.h
@@ -50,6 +50,7 @@ namespace PyName
 {
 LIBSHIBOKEN_API PyObject *dumps();
 LIBSHIBOKEN_API PyObject *loads();
+LIBSHIBOKEN_API PyObject *result();
 } // namespace PyName
 
 namespace PyMagicName
diff --git a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken2/libshiboken/sbkstring.cpp
index 4a441222f..38bb105d0 100644
--- a/sources/shiboken2/libshiboken/sbkstring.cpp
+++ b/sources/shiboken2/libshiboken/sbkstring.cpp
@@ -202,7 +202,7 @@ Py_ssize_t len(PyObject *str)
         return 0;
 
     if (PyUnicode_Check(str))
-        return PyUnicode_GET_SIZE(str);
+        return PepUnicode_GetLength(str);
 
     if (PyBytes_Check(str))
         return PyBytes_GET_SIZE(str);
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
index 3b0825049..24e75e42c 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
@@ -116,7 +116,7 @@ def build_brace_pattern(level, separators=""):
             | {so} {replacer} {sc}
             | {co} {replacer} {cc}
             | {ao} {replacer} {ac}
-          )*
+          )+
         )
         """)
     no_braces_q = "[^{all}{qu}{bs}]*".format(**locals())
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py
index 2bf9d7b09..147becdf7 100644
--- a/testing/wheel_tester.py
+++ b/testing/wheel_tester.py
@@ -121,6 +121,8 @@ def get_examples_dir():
 
 
 def package_prefix_names():
+    # Note: shiboken2_generator is not needed for compile_using_pyinstaller,
+    # but building modules with cmake needs it.
     return ["shiboken2", "shiboken2_generator", "PySide2"]
 
 
@@ -159,16 +161,18 @@ def try_install_wheels(wheels_dir, py_version):
     log.info("")
 
     for p in package_prefix_names():
-        pattern = "{}-*cp{}*.whl".format(p, py_version)
+        log.info("Trying to install {p}:".format(**locals()))
+        pattern = "{}-*cp{}*.whl".format(p, int(float(py_version)))
         files = find_files_using_glob(wheels_dir, pattern)
         if files and len(files) == 1:
             wheel_path = files[0]
             install_wheel(wheel_path)
         elif len(files) > 1:
-            raise RuntimeError("More than one wheel found for specific package and version.")
+            raise RuntimeError("More than one wheel found for specific {p} version."
+                               .format(**locals()))
         else:
-            raise RuntimeError("No wheels compatible with Python {} found "
-                               "for testing.".format(py_version))
+            raise RuntimeError("No {p} wheels compatible with Python {py_version} found "
+                               "for testing.".format(**locals()))
 
 
 def is_unix():
@@ -329,7 +333,7 @@ def try_build_examples():
 
 def run_wheel_tests(install_wheels):
     wheels_dir = get_wheels_dir()
-    py_version = sys.version_info[0]
+    py_version = "{v.major}.{v.minor}".format(v=sys.version_info)
 
     if install_wheels:
         log.info("Attempting to install wheels.\n")