diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-12-06 12:22:00 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-12-08 10:31:48 +0100 |
| commit | 703db9cf09c1b0670cd423a0d418bf09e0e11b83 (patch) | |
| tree | 43d5df349e9a94ddcfe189b1466699c7d775fe85 /sources/pyside6/PySide6/glue | |
| parent | 16b17fa01ed4851ade068e2500a6bf5170acb03d (diff) | |
PySide6: Fix build when defining QT_NO_CAST_FROM_ASCII for the modules
This unearthes a few conversion errors.
Pick-to: 6.6
Change-Id: Iad09bb08612938bd6890f3d1aa444d78e8fb8618
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/glue')
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtuitools.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 52a07aa26..2b5f72370 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -1440,7 +1440,7 @@ auto res = (*%CPPSELF) + cppArg0; // @snippet conversion-pystring-char char c = %CONVERTTOCPP[char](%in); -%out = %OUTTYPE(c); +%out = %OUTTYPE(static_cast<unsigned short>(c)); // @snippet conversion-pystring-char // @snippet conversion-pyint diff --git a/sources/pyside6/PySide6/glue/qtuitools.cpp b/sources/pyside6/PySide6/glue/qtuitools.cpp index 9fee3f0a4..e99c18f08 100644 --- a/sources/pyside6/PySide6/glue/qtuitools.cpp +++ b/sources/pyside6/PySide6/glue/qtuitools.cpp @@ -62,7 +62,7 @@ Q_IMPORT_PLUGIN(PyCustomWidgets); // @snippet quiloader-registercustomwidget registerCustomWidget(%PYARG_1); -%CPPSELF.addPluginPath(""); // force reload widgets +%CPPSELF.addPluginPath(QString{}); // force reload widgets // @snippet quiloader-registercustomwidget // @snippet quiloader-load-1 @@ -87,7 +87,7 @@ char *arg1 = PyBytes_AsString(strObj); QByteArray uiFileName(arg1); Py_DECREF(strObj); -QFile uiFile(uiFileName); +QFile uiFile(QString::fromUtf8(uiFileName)); if (!uiFile.exists()) { qCritical().noquote() << "File" << uiFileName << "does not exists"; @@ -102,7 +102,7 @@ if (uiFileName.isEmpty()) { // Use the 'pyside6-uic' wrapper instead of 'uic' // This approach is better than rely on 'uic' since installing // the wheels cover this case. -QString uicBin("pyside6-uic"); +QString uicBin(QStringLiteral("pyside6-uic")); QStringList uicArgs = {QString::fromUtf8(uiFileName)}; QProcess uicProcess; |