diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-03 20:24:38 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2020-01-17 11:31:35 +0100 |
| commit | c6899f16389458766904d8d913054f09076e06dd (patch) | |
| tree | e24f942a01720775391ae04557e24a35839f7361 /src/quick/designer | |
| parent | 9e674be4fb8c369873a009f58e3152a12d2c4cce (diff) | |
Replace QVariant::type with QVariant::userType
as type is going to be deprecated.
This change was done automatically with the help of clazy.
In addition, ColumnRoleMetadata was changed to take an int instead
of a QVariant::Type
Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quick/designer')
| -rw-r--r-- | src/quick/designer/qqmldesignermetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/quick/designer/qquickdesignercustomobjectdata.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/designer/qqmldesignermetaobject.cpp b/src/quick/designer/qqmldesignermetaobject.cpp index de7da7f9be..0aa5dc2613 100644 --- a/src/quick/designer/qqmldesignermetaobject.cpp +++ b/src/quick/designer/qqmldesignermetaobject.cpp @@ -240,7 +240,7 @@ int QQmlDesignerMetaObject::metaCall(QObject *o, QMetaObject::Call call, int id, if (call == QMetaObject::WriteProperty && propertyById.userType() == QMetaType::QVariant - && reinterpret_cast<QVariant *>(a[0])->type() == QVariant::Double + && reinterpret_cast<QVariant *>(a[0])->userType() == QMetaType::Double && qt_is_nan(reinterpret_cast<QVariant *>(a[0])->toDouble())) { return -1; } diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp index 6b39f5157b..66a86bffd5 100644 --- a/src/quick/designer/qquickdesignercustomobjectdata.cpp +++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp @@ -278,7 +278,7 @@ void QQuickDesignerCustomObjectData::setPropertyBinding(QQmlContext *context, //Refcounting is taking take care of deletion binding->update(); if (binding->hasError()) { - if (property.property().userType() == QVariant::String) + if (property.property().userType() == QMetaType::QString) property.write(QVariant(QLatin1Char('#') + expression + QLatin1Char('#'))); } |