1 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp
index c701265bc6..387ebc7c53 100644
--- a/src/gui/rhi/qshaderdescription.cpp
+++ b/src/gui/rhi/qshaderdescription.cpp
@@ -1136,13 +1136,13 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
     QJsonObject root;
 
     QJsonArray jinputs;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(inVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(inVars))
         jinputs.append(inOutObject(v));
     if (!jinputs.isEmpty())
         root[inputsKey()] = jinputs;
 
     QJsonArray joutputs;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(outVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(outVars))
         joutputs.append(inOutObject(v));
     if (!joutputs.isEmpty())
         root[outputsKey()] = joutputs;
@@ -1200,7 +1200,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[storageBlocksKey()] = jstorageBlocks;
 
     QJsonArray jcombinedSamplers;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(combinedImageSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(combinedImageSamplers)) {
         QJsonObject sampler;
         sampler[nameKey()] = QString::fromUtf8(v.name);
         sampler[typeKey()] = typeStr(v.type);
@@ -1211,7 +1211,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[combinedImageSamplersKey()] = jcombinedSamplers;
 
     QJsonArray jstorageImages;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(storageImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(storageImages)) {
         QJsonObject image;
         image[nameKey()] = QString::fromUtf8(v.name);
         image[typeKey()] = typeStr(v.type);
@@ -1222,7 +1222,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[storageImagesKey()] = jstorageImages;
 
     QJsonArray jinBuiltins;
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(inBuiltins)) {
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(inBuiltins)) {
         QJsonObject builtin;
         builtin[typeKey()] = builtinTypeStr(v.type);
         jinBuiltins.append(builtin);
@@ -1231,7 +1231,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[inBuiltinsKey()] = jinBuiltins;
 
     QJsonArray joutBuiltins;
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(outBuiltins)) {
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(outBuiltins)) {
         QJsonObject builtin;
         builtin[typeKey()] = builtinTypeStr(v.type);
         joutBuiltins.append(builtin);
@@ -1259,7 +1259,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[tessellationPartitioningKey()] = tessPartStr(tessPart);
 
     QJsonArray jseparateImages;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateImages)) {
         QJsonObject image;
         image[nameKey()] = QString::fromUtf8(v.name);
         image[typeKey()] = typeStr(v.type);
@@ -1270,7 +1270,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[separateImagesKey()] = jseparateImages;
 
     QJsonArray jseparateSamplers;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateSamplers)) {
         QJsonObject sampler;
         sampler[nameKey()] = QString::fromUtf8(v.name);
         sampler[typeKey()] = typeStr(v.type);
@@ -1286,11 +1286,11 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
 void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
 {
     (*stream) << int(inVars.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(inVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(inVars))
         serializeInOutVar(stream, v);
 
     (*stream) << int(outVars.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(outVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(outVars))
         serializeInOutVar(stream, v);
 
     (*stream) << int(uniformBlocks.size());
@@ -1327,14 +1327,14 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
     }
 
     (*stream) << int(combinedImageSamplers.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(combinedImageSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(combinedImageSamplers)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
     }
 
     (*stream) << int(storageImages.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(storageImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(storageImages)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
@@ -1344,14 +1344,14 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
         (*stream) << quint32(localSize[i]);
 
     (*stream) << int(separateImages.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateImages)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
     }
 
     (*stream) << int(separateSamplers.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateSamplers)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
@@ -1363,11 +1363,11 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
     (*stream) << quint32(tessPart);
 
     (*stream) << int(inBuiltins.size());
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(inBuiltins))
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(inBuiltins))
         (*stream) << int(v.type);
 
     (*stream) << int(outBuiltins.size());
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(outBuiltins))
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(outBuiltins))
         (*stream) << int(v.type);
 }