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

Change-Id: Ia378b044e2b8dd7c3cc8e25ee26257a0f467c975

20 files changed, 117 insertions, 19 deletions

diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml
index 87abb476c..a00f5676e 100644
--- a/coin/instructions/execute_test_instructions.yaml
+++ b/coin/instructions/execute_test_instructions.yaml
@@ -30,7 +30,7 @@ instructions:
   - type: ExecuteCommand
     command: "c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
     maxTimeInSeconds: 14400
-    maxTimeBetweenOutput: 300
+    maxTimeBetweenOutput: 500
     enable_if:
         condition: property
         property: host.os
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 5c3033b04..5d11e9d52 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -47,6 +47,8 @@ from build_scripts.utils import get_ci_qmake_path
 import os
 import datetime
 import calendar
+import site
+import sys
 
 # Values must match COIN thrift
 CI_HOST_OS = option_value("os")
@@ -110,7 +112,7 @@ def call_setup(python_ver, phase):
     if phase in ["BUILD"]:
         rmtree(_env, True)
         # Pinning the virtualenv before creating one
-        run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv")
+        run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv")
         run_instruction(["virtualenv", "-p", _pExe,  _env], "Failed to create virtualenv")
         # When the 'python_ver' variable is empty, we are using Python 2
         # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index c3752cb9f..79a788038 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -44,6 +44,8 @@ from build_scripts.utils import run_instruction
 from build_scripts.utils import rmtree
 from build_scripts.utils import get_ci_qmake_path
 import os
+import site
+import sys
 
 # Values must match COIN thrift
 CI_HOST_OS = option_value("os")
@@ -65,7 +67,7 @@ def call_testrunner(python_ver, buildnro):
     _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH)
     rmtree(_env, True)
     # Pinning the virtualenv before creating one
-    run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv")
+    run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv")
     run_instruction(["virtualenv", "-p", _pExe,  _env], "Failed to create virtualenv")
     # When the 'python_ver' variable is empty, we are using Python 2
     # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue
diff --git a/dist/changes-5.14.2.3 b/dist/changes-5.14.2.3
new file mode 100644
index 000000000..6f17bc4bd
--- /dev/null
+++ b/dist/changes-5.14.2.3
@@ -0,0 +1,35 @@
+Qt for Python 5.14.2.3 is a bug-fix release.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qtforpython/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                  PySide2                                 *
+****************************************************************************
+
+ - [PYSIDE-1223] pyside2-uic instead of uic is not used for loadUiType()
+ - [PYSIDE-1257] Deployment with cx_freeze using zip_include_packages has
+                 been fixed
+ - [PYSIDE-1282] A crash using QThread.terminate() on pthreads has
+                 been fixed
+ - [PYSIDE-1311] The downloads functionality of the  Tabbedbrowser example
+                 has been fixed
+ - [PYSIDE-1321] A leaking reference in the PySide2 property getter has
+                 been fixed
+
+****************************************************************************
+*                                  Shiboken2                               *
+****************************************************************************
+
+ - [PYSIDE-1325] Wrong generated code for default-initialized function
+                 arguments ({}) has  been fixed
diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
index 8b96b3ddd..093eed6bb 100644
--- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
@@ -241,4 +241,4 @@ class BrowserTabWidget(QTabWidget):
         return -1
 
     def _download_requested(self, item):
-        self.downloadRequested.emit(item)
+        self.download_requested.emit(item)
diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
index a118f6eec..73b8d116b 100644
--- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py
@@ -92,7 +92,7 @@ class DownloadWidget(QProgressBar):
         path = self._download_item.path()
         tool_tip = "{}\n{}".format(self._download_item.url().toString(),
                                    QDir.toNativeSeparators(path))
-        total_bytes = self._download_item.total_bytes()
+        total_bytes = self._download_item.totalBytes()
         if total_bytes > 0:
             tool_tip += "\n{}K".format(total_bytes / 1024)
         state = self.state()
@@ -118,11 +118,11 @@ class DownloadWidget(QProgressBar):
     def _launch(self):
         DownloadWidget.open_file(self._download_item.path())
 
-    def mouse_double_click_event(self, event):
+    def mouseDoubleClickEvent(self, event):
         if self.state() == QWebEngineDownloadItem.DownloadCompleted:
             self._launch()
 
-    def context_menu_event(self, event):
+    def contextMenuEvent(self, event):
         state = self.state()
         context_menu = QMenu()
         launch_action = context_menu.addAction("Launch")
diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py
index 8a75cd5e0..438dd5c9d 100644
--- a/examples/webenginewidgets/tabbedbrowser/main.py
+++ b/examples/webenginewidgets/tabbedbrowser/main.py
@@ -353,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
+            if (type(old_download).__name__ == 'DownloadWidget' 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)
+        download_widget = DownloadWidget(item)
+        download_widget.remove_requested.connect(self._remove_download_requested,
+                                                 Qt.QueuedConnection)
         self.statusBar().addWidget(download_widget)
 
     def _remove_download_requested(self):
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 26193a0aa..8294947ed 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1460,9 +1460,15 @@
     <enum-type name="IteratorFlag" flags="IteratorFlags"/>
   </object-type>
   <object-type name="QThread">
+    <inject-code file="../glue/qtcore.cpp" class="native" position="beginning" snippet="qthread_pthread_cleanup"/>
     <enum-type name="Priority"/>
     <modify-function signature="currentThreadId()" remove="all"/>
-    <modify-function signature="run()" allow-thread="yes"/>
+    <modify-function signature="run()" allow-thread="yes">
+        <inject-code file="../glue/qtcore.cpp" class="native" position="beginning"
+                     snippet="qthread_pthread_cleanup_install"/>
+        <inject-code file="../glue/qtcore.cpp" class="native" position="end"
+                     snippet="qthread_pthread_cleanup_uninstall"/>
+    </modify-function>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
     <modify-function signature="msleep(unsigned long)" allow-thread="yes"/>
     <modify-function signature="sleep(unsigned long)" allow-thread="yes"/>
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index 8013ac68a..f860c6ac9 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -12,6 +12,9 @@ __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @B
 def _additional_dll_directories(package_dir):
     # Find shiboken2 relative to the package directory.
     root = os.path.dirname(package_dir)
+    # Check for a flat .zip as deployed by cx_free(PYSIDE-1257)
+    if root.endswith('.zip'):
+        return []
     shiboken2 = os.path.join(root, 'shiboken2')
     if os.path.isdir(shiboken2): # Standard case, only shiboken2 is needed
         return [shiboken2]
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index 111e324b9..41ee743e7 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -1960,3 +1960,31 @@ PyTuple_SET_ITEM(%out, 0, %CONVERTTOPYTHON[%INTYPE_0](%in.first));
 PyTuple_SET_ITEM(%out, 1, %CONVERTTOPYTHON[%INTYPE_1](%in.second));
 return %out;
 // @snippet return-qpair
+
+// @snippet qthread_pthread_cleanup
+#ifdef Q_OS_UNIX
+#  include <stdio.h>
+#  include <pthread.h>
+static void qthread_pthread_cleanup(void *arg)
+{
+    // PYSIDE 1282: When terminating a thread using QThread::terminate()
+    // (pthread_cancel()), QThread::run() is aborted and the lock is released,
+    // but ~GilState() is still executed for some reason. Prevent it from
+    // releasing.
+    auto gil = reinterpret_cast<Shiboken::GilState *>(arg);
+    gil->abandon();
+}
+#endif // Q_OS_UNIX
+// @snippet qthread_pthread_cleanup
+
+// @snippet qthread_pthread_cleanup_install
+#ifdef Q_OS_UNIX
+pthread_cleanup_push(qthread_pthread_cleanup, &gil);
+#endif
+// @snippet qthread_pthread_cleanup_install
+
+// @snippet qthread_pthread_cleanup_uninstall
+#ifdef Q_OS_UNIX
+pthread_cleanup_pop(0);
+#endif
+// @snippet qthread_pthread_cleanup_uninstall
diff --git a/sources/pyside2/PySide2/glue/qtuitools.cpp b/sources/pyside2/PySide2/glue/qtuitools.cpp
index 668b512e4..d81f6205a 100644
--- a/sources/pyside2/PySide2/glue/qtuitools.cpp
+++ b/sources/pyside2/PySide2/glue/qtuitools.cpp
@@ -137,16 +137,19 @@ if (uiFileName.isEmpty()) {
     Py_RETURN_NONE;
 }
 
-QString uicBin("uic");
-QStringList uicArgs = {"-g", "python", QString::fromUtf8(uiFileName)};
+// Use the 'pyside2-uic' wrapper instead of 'uic'
+// This approach is better than rely on 'uic' since installing
+// the wheels cover this case.
+QString uicBin("pyside2-uic");
+QStringList uicArgs = {QString::fromUtf8(uiFileName)};
 
 QProcess uicProcess;
 uicProcess.start(uicBin, uicArgs);
 if (!uicProcess.waitForFinished()) {
-    qCritical() << "Cannot run 'uic': " << uicProcess.errorString() << " - "
+    qCritical() << "Cannot run 'pyside2-uic': " << uicProcess.errorString() << " - "
                 << "Exit status " << uicProcess.exitStatus()
                 << " (" << uicProcess.exitCode() << ")\n"
-                << "Check if 'uic' is in PATH";
+                << "Check if 'pyside2-uic' is in PATH";
     Py_RETURN_NONE;
 }
 QByteArray uiFileContent = uicProcess.readAllStandardOutput();
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index d22958398..e2b8708ce 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -328,7 +328,6 @@ PyObject *getMetaDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *nam
         Py_DECREF(attr);
         if (!value)
             return 0;
-        Py_INCREF(value);
         attr = value;
     }
 
diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp
index 25daea99e..7c9ce4fb2 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken2/generator/main.cpp
@@ -41,7 +41,7 @@
 #include "headergenerator.h"
 #include "qtdocgenerator.h"
 
-#ifdef _WINDOWS
+#ifdef Q_OS_WIN
 static const QChar pathSplitter = QLatin1Char(';');
 #else
 static const QChar pathSplitter = QLatin1Char(':');
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index b7852c017..b6ab70d1f 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -589,7 +589,7 @@ QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction
 {
     QString value = arg->defaultValueExpression();
 
-    if (value.isEmpty()
+    if (value.isEmpty() || value == QLatin1String("{}")
         || arg->hasModifiedDefaultValueExpression()
         || isPointer(arg->type())) {
         return value;
diff --git a/sources/shiboken2/libshiboken/gilstate.cpp b/sources/shiboken2/libshiboken/gilstate.cpp
index a59c6f01e..76a4d0e61 100644
--- a/sources/shiboken2/libshiboken/gilstate.cpp
+++ b/sources/shiboken2/libshiboken/gilstate.cpp
@@ -63,5 +63,12 @@ void GilState::release()
     }
 }
 
+// Abandon the lock: Only for special situations, like termination of a
+// POSIX thread (PYSIDE 1282).
+void GilState::abandon()
+{
+    m_locked = false;
+}
+
 } // namespace Shiboken
 
diff --git a/sources/shiboken2/libshiboken/gilstate.h b/sources/shiboken2/libshiboken/gilstate.h
index d22f688ba..fbf39ead0 100644
--- a/sources/shiboken2/libshiboken/gilstate.h
+++ b/sources/shiboken2/libshiboken/gilstate.h
@@ -57,6 +57,7 @@ public:
     GilState();
     ~GilState();
     void release();
+    void abandon();
 private:
     PyGILState_STATE m_gstate;
     bool m_locked = false;
diff --git a/sources/shiboken2/tests/libsample/pen.cpp b/sources/shiboken2/tests/libsample/pen.cpp
index d30071f49..b08721f79 100644
--- a/sources/shiboken2/tests/libsample/pen.cpp
+++ b/sources/shiboken2/tests/libsample/pen.cpp
@@ -65,3 +65,7 @@ int Pen::ctorType()
 {
     return m_ctor;
 }
+
+void Pen::drawLine(int x1, int y1, int x2, int y2, RenderHints renderHints)
+{
+}
diff --git a/sources/shiboken2/tests/libsample/pen.h b/sources/shiboken2/tests/libsample/pen.h
index ca079198b..6b3bf9f1a 100644
--- a/sources/shiboken2/tests/libsample/pen.h
+++ b/sources/shiboken2/tests/libsample/pen.h
@@ -49,11 +49,16 @@ class LIBSAMPLE_API Pen
 public:
     enum { EmptyCtor, EnumCtor, ColorCtor, CopyCtor };
 
+    enum  RenderHints { None = 0, Antialiasing = 0x1, TextAntialiasing = 0x2 };
+
     Pen();
     Pen(SampleNamespace::Option option);
     Pen(const Color& color);
     Pen(const Pen& pen);
 
+    // PYSIDE-1325, default initializer
+    void drawLine(int x1, int y1, int x2, int y2, RenderHints renderHints = {});
+
     int ctorType();
 private:
     int m_ctor;
diff --git a/sources/shiboken2/tests/samplebinding/pen_test.py b/sources/shiboken2/tests/samplebinding/pen_test.py
index 408871bb3..89abf4d54 100644
--- a/sources/shiboken2/tests/samplebinding/pen_test.py
+++ b/sources/shiboken2/tests/samplebinding/pen_test.py
@@ -63,6 +63,8 @@ class TestPen(unittest.TestCase):
     def testPenWithIntConvertedToColor(self):
         pen = Pen(1)
         self.assertEqual(pen.ctorType(), Pen.ColorCtor)
+        pen.drawLine(0, 0, 5, 5)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
index 30ad5def7..3aaecf247 100644
--- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
+++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
@@ -2310,6 +2310,7 @@
     <value-type name="Color" />
     <value-type name="Pen">
         <enum-type identified-by-value="EnumCtor"/>
+        <enum-type name="RenderHints"/>
     </value-type>
 
     <value-type name="CtorConvRule">