Update qtbase dependency

- Adapt to uniform name type change.

- Fix compiler warnings from deprecated QChar constructor.
  Use string literal prefix 'u' to avoid run-time conversion.

Follow up on 1b33ee95e5c6e5e27f732fd273920861fdae486a in qtbase.

Change-Id: I2322a630ba2dd394576cd65bd7d6eac937a545f2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/quick/scenegraph/qsgrhishadereffectnode.cpp b/src/quick/scenegraph/qsgrhishadereffectnode.cpp
index cc2a887a9c..969522e3ce 100644
--- a/src/quick/scenegraph/qsgrhishadereffectnode.cpp
+++ b/src/quick/scenegraph/qsgrhishadereffectnode.cpp
@@ -859,13 +859,14 @@ bool QSGRhiGuiThreadShaderEffectManager::reflect(ShaderInfo *result)
             for (const QShaderDescription::BlockVariable &member : ubuf.members) {
                 ShaderInfo::Variable v;
                 v.type = ShaderInfo::Constant;
-                v.name = member.name.toUtf8();
+                v.name = member.name;
                 v.offset = member.offset;
                 v.size = member.size;
                 result->variables.append(v);
             }
         } else {
-            qWarning("Uniform block %s (binding %d) ignored", qPrintable(ubuf.blockName), ubuf.binding);
+            qWarning("Uniform block %s (binding %d) ignored", ubuf.blockName.constData(),
+                     ubuf.binding);
         }
     }
 
@@ -875,7 +876,7 @@ bool QSGRhiGuiThreadShaderEffectManager::reflect(ShaderInfo *result)
         const QShaderDescription::InOutVariable &combinedImageSampler(combinedImageSamplers[i]);
         ShaderInfo::Variable v;
         v.type = ShaderInfo::Sampler;
-        v.name = combinedImageSampler.name.toUtf8();
+        v.name = combinedImageSampler.name;
         v.bindPoint = combinedImageSampler.binding;
         result->variables.append(v);
     }