Fix Qt6 build in preparation of qt5 submodule update

Fixes the QTextStream usages.

Change-Id: I0c009a82fb644a9f3c3d42ec410d18b680977f23
(cherry picked from commit 1c5c5f7aadc2dcc73a21eeb818e95c4e1b7de70f)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 16 insertions, 16 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 4f911420ce..f0c57ffd80 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -454,13 +454,13 @@ void qsg_dumpShadowRoots(Node *n)
     QByteArray ind(indent, ' ');
 
     if (n->type() == QSGNode::ClipNodeType || n->isBatchRoot) {
-        qDebug() << ind.constData() << "[X]" << n->sgNode << hex << uint(n->sgNode->flags());
+        qDebug() << ind.constData() << "[X]" << n->sgNode << Qt::hex << uint(n->sgNode->flags());
         qsg_dumpShadowRoots(n->rootInfo(), indent);
     } else {
         QDebug d = qDebug();
-        d << ind.constData() << "[ ]" << n->sgNode << hex << uint(n->sgNode->flags());
+        d << ind.constData() << "[ ]" << n->sgNode << Qt::hex << uint(n->sgNode->flags());
         if (n->type() == QSGNode::GeometryNodeType)
-            d << "order" << dec << n->element()->order;
+            d << "order" << Qt::dec << n->element()->order;
     }
 
     SHADOWNODE_TRAVERSE(n)
@@ -2354,7 +2354,7 @@ void Renderer::uploadBatch(Batch *b)
                     iDump << "  -- Index Data, count:" << b->indexCount;
                     for (int i=0; i<b->indexCount; ++i) {
                         if ((i % 24) == 0)
-                            iDump << endl << "  --- ";
+                            iDump << Qt::endl << "  --- ";
                         iDump << id[i];
                     }
                 }
@@ -3961,8 +3961,8 @@ void Renderer::setGraphicsPipeline(QRhiCommandBuffer *cb, const Batch *batch, El
 void Renderer::renderBatches()
 {
     if (Q_UNLIKELY(debug_render())) {
-        qDebug().nospace() << "Rendering:" << endl
-                           << " -> Opaque: " << qsg_countNodesInBatches(m_opaqueBatches) << " nodes in " << m_opaqueBatches.size() << " batches..." << endl
+        qDebug().nospace() << "Rendering:" << Qt::endl
+                           << " -> Opaque: " << qsg_countNodesInBatches(m_opaqueBatches) << " nodes in " << m_opaqueBatches.size() << " batches..." << Qt::endl
                            << " -> Alpha: " << qsg_countNodesInBatches(m_alphaBatches) << " nodes in " << m_alphaBatches.size() << " batches...";
     }
 
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index e07f89a6d1..a35629d874 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1463,7 +1463,7 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n)
         d << "Geometry(null)";
         return d;
     }
-    d << "GeometryNode(" << hex << (const void *) n << dec;
+    d << "GeometryNode(" << Qt::hex << (const void *) n << Qt::dec;
 
     const QSGGeometry *g = n->geometry();
 
@@ -1514,7 +1514,7 @@ QDebug operator<<(QDebug d, const QSGClipNode *n)
         d << "ClipNode(null)";
         return d;
     }
-    d << "ClipNode(" << hex << (const void *) n << dec;
+    d << "ClipNode(" << Qt::hex << (const void *) n << Qt::dec;
 
     if (n->childCount())
         d << "children=" << n->childCount();
@@ -1537,7 +1537,7 @@ QDebug operator<<(QDebug d, const QSGTransformNode *n)
     }
     const QMatrix4x4 m = n->matrix();
     d << "TransformNode(";
-    d << hex << (const void *) n << dec;
+    d << Qt::hex << (const void *) n << Qt::dec;
     if (m.isIdentity())
         d << "identity";
     else if (m.determinant() == 1 && m(0, 0) == 1 && m(1, 1) == 1 && m(2, 2) == 1)
@@ -1559,7 +1559,7 @@ QDebug operator<<(QDebug d, const QSGOpacityNode *n)
         return d;
     }
     d << "OpacityNode(";
-    d << hex << (const void *) n << dec;
+    d << Qt::hex << (const void *) n << Qt::dec;
     d << "opacity=" << n->opacity()
       << "combined=" << n->combinedOpacity()
       << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
@@ -1578,7 +1578,7 @@ QDebug operator<<(QDebug d, const QSGRootNode *n)
         return d;
     }
     QDebugStateSaver saver(d);
-    d << "RootNode" << hex << (const void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
+    d << "RootNode" << Qt::hex << (const void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
@@ -1611,8 +1611,8 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         d << static_cast<const QSGOpacityNode *>(n);
         break;
     case QSGNode::RenderNodeType:
-        d << "RenderNode(" << hex << (const void *) n << dec
-          << "flags=" << (int) n->flags() << dec
+        d << "RenderNode(" << Qt::hex << (const void *) n << Qt::dec
+          << "flags=" << (int) n->flags() << Qt::dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
         d << QSGNodePrivate::description(n);
@@ -1620,8 +1620,8 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         d << ')';
         break;
     default:
-        d << "Node(" << hex << (const void *) n << dec
-          << "flags=" << (int) n->flags() << dec
+        d << "Node(" << Qt::hex << (const void *) n << Qt::dec
+          << "flags=" << (int) n->flags() << Qt::dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
         d << QSGNodePrivate::description(n);
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index 2bf4a83a8e..e8c3ac4abb 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -364,7 +364,7 @@ void QSGDefaultRenderContext::compileShader(QSGMaterialShader *shader, QSGMateri
         p->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragmentCode ? fragmentCode : shader->fragmentShader());
         p->link();
         if (!p->isLinked())
-            qWarning() << "shader compilation failed:" << endl << p->log();
+            qWarning() << "shader compilation failed:" << Qt::endl << p->log();
     } else {
         shader->compile();
     }