diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 09:21:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 09:13:19 +0000 |
| commit | 3e252bba6ea6b96acb412d08131953e74d2b84ee (patch) | |
| tree | 5ed2d2677e2793871cc78666aed26ba99b1c04f1 /sources/pyside2/libpyside/pysidemetafunction.cpp | |
| parent | f440ebfd838d0b754bbba38fbbd2ccf5318f7347 (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/libpyside/pysidemetafunction.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysidemetafunction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysidemetafunction.cpp b/sources/pyside2/libpyside/pysidemetafunction.cpp index f4b95385a..1096a84bb 100644 --- a/sources/pyside2/libpyside/pysidemetafunction.cpp +++ b/sources/pyside2/libpyside/pysidemetafunction.cpp @@ -183,7 +183,7 @@ bool call(QObject *self, int methodIndex, PyObject *args, PyObject **retVal) "registered on meta type: %s", typeName.data()); break; } - methValues[i] = QVariant(typeId, static_cast<const void *>(0)); + methValues[i] = QVariant(static_cast<QVariant::Type>(typeId)); } methArgs[i] = methValues[i].data(); if (i == 0) // Don't do this for return type |