diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-19 16:56:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-19 16:56:57 +0200 |
| commit | f93263d2f4d94e20131668dc60a40114ad183942 (patch) | |
| tree | a000c75eed921dc6d8801b554208760f09580199 /sources/pyside2/PySide2/glue | |
| parent | 5092804aa3e9cbf398d1cc5edf0381d4e54e8182 (diff) | |
| parent | 4a4e44c6f8487f882d443ebfc05795cc75ba5e6e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If40b0ab35cd2ad2bd0d982881094ce3dbf46ccf3
Diffstat (limited to 'sources/pyside2/PySide2/glue')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtuitools.cpp | 11 |
1 files changed, 7 insertions, 4 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(); |