aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/glue
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-08-17 09:21:02 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-08-17 09:13:19 +0000
commit3e252bba6ea6b96acb412d08131953e74d2b84ee (patch)
tree5ed2d2677e2793871cc78666aed26ba99b1c04f1 /sources/pyside2/PySide2/glue
parentf440ebfd838d0b754bbba38fbbd2ccf5318f7347 (diff)
Fix build of qtbase modules
Adapt to qtbase/2f9a294252ae44defd4d8ae1b3c09d8e36ee0612: - Removal of deprecated QSettings API - Changed signature of QLineF - Change of QVariant constructors - Introduction of new QIODeviceBase class Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I834f535af3c977164def12fc86dfd87282c240aa Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/glue')
-rw-r--r--sources/pyside2/PySide2/glue/qtcore.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index 092bfab80..6061b27d6 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -194,7 +194,7 @@ static QVariant QVariant_convertToValueList(PyObject *list)
if (typeId > 0) {
Shiboken::Conversions::SpecificConverter converter(listTypeName);
if (converter) {
- QVariant var(typeId, nullptr);
+ QVariant var(static_cast<QVariant::Type>(typeId));
converter.toCpp(list, &var);
return var;
}
@@ -1782,7 +1782,7 @@ if (!typeCode || !typeName) {
%out = QVariant::fromValue(PySide::PyObjectWrapper(%in));
}
else {
- QVariant var(typeCode, nullptr);
+ QVariant var(static_cast<QVariant::Type>(typeCode));
Shiboken::Conversions::SpecificConverter converter(typeName);
converter.toCpp(pyIn, var.data());
%out = var;