Merge remote-tracking branch 'origin/dev' into new-backend

Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
index 62771eb8f9..b4fb721a8b 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
@@ -171,7 +171,7 @@ void QSGD3D12ShaderLinker::linkTextureSubRects()
     // texture bind point.
     for (Constant &c : constants) {
         if (c.specialType == QSGShaderEffectNode::VariableData::SubRect) {
-            if (c.value.type() == QMetaType::QByteArray) {
+            if (c.value.type() == QVariant::ByteArray) {
                 const QByteArray name = c.value.toByteArray();
                 if (!textureNameMap.contains(name))
                     qWarning("ShaderEffect: qt_SubRect_%s refers to unknown source texture", qPrintable(name));