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/items | |
| 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/items')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickopenglshadereffectnode.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 8454010ee9..b5932c6f80 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1478,7 +1478,7 @@ QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const if (i && i->isVisible() && (i->flags() & QQuickItem::ItemAcceptsInputMethod) && i == d->imeItem) { //### how robust is i == d->imeItem check? QVariant v = i->inputMethodQuery(query); - if (v.userType() == QVariant::RectF) + if (v.userType() == QMetaType::QRectF) v = d->item->mapRectFromItem(i, v.toRectF()); //### cost? return v; } diff --git a/src/quick/items/qquickopenglshadereffectnode.cpp b/src/quick/items/qquickopenglshadereffectnode.cpp index 26ef59c20e..5721f116e8 100644 --- a/src/quick/items/qquickopenglshadereffectnode.cpp +++ b/src/quick/items/qquickopenglshadereffectnode.cpp @@ -178,7 +178,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri if (state.isMatrixDirty()) program()->setUniformValue(loc, state.combinedMatrix()); } else if (d.specialType == UniformData::None) { - switch (int(d.value.type())) { + switch (int(d.value.userType())) { case QMetaType::QColor: program()->setUniformValue(loc, qt_premultiply_color(qvariant_cast<QColor>(d.value))); break; |