diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 11:39:07 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 11:45:51 +0100 |
| commit | 4e10a6769fdcaa711dac34dd5dd326c83a27c6bd (patch) | |
| tree | 372eff9f11708b8e52cd6449e7c06e7b8b1c0561 /src/imports/controls | |
| parent | cfaf1d576fd1f44ea3e424af85dfbaa641d2665d (diff) | |
Fix deprecation warnings related to QMetaType
Change-Id: I4e6c1b03915c33f6225c0fb7f86e6acb7715cd4d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/qquickuniversalstyle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index d343f2f5..a130db6c 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -1356,7 +1356,7 @@ void QQuickMaterialStyle::attachedParentChange(QQuickAttachedObject *newParent, bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba, bool *custom) const { *custom = false; - if (var.type() == QVariant::Int) { + if (var.metaType().id() == QMetaType::Int) { int val = var.toInt(); if (val > BlueGrey) { qmlWarning(parent()) << "unknown Material." << name << " value: " << val; diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index d46752f3..605cfce2 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -592,7 +592,7 @@ void QQuickUniversalStyle::initGlobals() bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba) const { - if (var.type() == QVariant::Int) { + if (var.metaType().id() == QMetaType::Int) { int val = var.toInt(); if (val < Lime || val > Taupe) { qmlWarning(parent()) << "unknown Universal." << name << " value: " << val; |