diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-23 22:16:10 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-23 22:16:10 +0200 |
| commit | 6cc61508acd7b65477e006475f64dc3406af668f (patch) | |
| tree | 7355632654b206a2fab772721cfa72e72ecf3300 /sources/pyside2/libpyside/signalmanager.cpp | |
| parent | 54e7da4895cd5d9228cef3e4e3ebc61c5109ed12 (diff) | |
| parent | ff94459c809e2ccd13e6d669b053667d35b3e571 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0685101058a4a814d97c56177030bf7a66483643
Diffstat (limited to 'sources/pyside2/libpyside/signalmanager.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp index 8e8cc9f02..93847e066 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp +++ b/sources/pyside2/libpyside/signalmanager.cpp @@ -411,11 +411,13 @@ int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id, case QMetaObject::ReadProperty: case QMetaObject::WriteProperty: case QMetaObject::ResetProperty: +# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) case QMetaObject::QueryPropertyDesignable: case QMetaObject::QueryPropertyScriptable: case QMetaObject::QueryPropertyStored: case QMetaObject::QueryPropertyEditable: case QMetaObject::QueryPropertyUser: +# endif // < Qt 6 pp->d->metaCallHandler(pp, pySelf, call, args); break; #endif |