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

Change-Id: If40b0ab35cd2ad2bd0d982881094ce3dbf46ccf3

2 files changed, 8 insertions, 5 deletions

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/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp
index 476e176d3..3c9d13b48 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken2/generator/main.cpp
@@ -42,7 +42,7 @@
 #include "headergenerator.h"
 #include "qtdocgenerator.h"
 
-#ifdef _WINDOWS
+#ifdef Q_OS_WIN
 static const QChar pathSplitter = QLatin1Char(';');
 #else
 static const QChar pathSplitter = QLatin1Char(':');