diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-02 15:18:12 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-02 15:18:12 +0200 |
commit | 08b0fd0bca56c8a6c7fb0b4ca3837e800b98736d (patch) | |
tree | 8cc07ff2cced7e253f0605927ee5c2143d0ca4cf /sources/pyside2/PySide2/glue/qtuitools.cpp | |
parent | 023fc0b747460b0e4f30d5b38961bb53dcfdde3c (diff) | |
parent | bdb6f68fd65537d6bd3f6e2e896a8471a81a9279 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Ia378b044e2b8dd7c3cc8e25ee26257a0f467c975
Diffstat (limited to 'sources/pyside2/PySide2/glue/qtuitools.cpp')
-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(); |