Make compilers happy

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

6 files changed, 15 insertions, 4 deletions

diff --git a/.qmake.conf b/.qmake.conf
index b728225..6266daa 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,6 @@
 load(qt_build_config)
 
-CONFIG += warning_clean
+# CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
 MODULE_VERSION = 2.1.0
diff --git a/src/imports/studio3d/q3dsstudio3dviewdesc_p.h b/src/imports/studio3d/q3dsstudio3dviewdesc_p.h
index 34911bf..0a27abc 100644
--- a/src/imports/studio3d/q3dsstudio3dviewdesc_p.h
+++ b/src/imports/studio3d/q3dsstudio3dviewdesc_p.h
@@ -44,10 +44,10 @@
 #include <QSize>
 #include <Qt3DCore/QNodeId>
 
-class Q3DSStudio3DView;
-
 QT_BEGIN_NAMESPACE
 
+class Q3DSStudio3DView;
+
 struct Q3DSStudio3DViewDesc
 {
     Q3DSStudio3DView *view = nullptr;
diff --git a/src/runtime/aping/q3dsstudio3dengine.cpp b/src/runtime/aping/q3dsstudio3dengine.cpp
index e6e7d5b..b8cd326 100644
--- a/src/runtime/aping/q3dsstudio3dengine.cpp
+++ b/src/runtime/aping/q3dsstudio3dengine.cpp
@@ -39,6 +39,7 @@
 #include <QOpenGLFramebufferObject>
 #include <QOffscreenSurface>
 #include <QQuickRenderControl>
+#include <QSGImageNode>
 #include <QRunnable>
 #include <QThread>
 #include <Qt3DCore/QEntity>
@@ -476,7 +477,7 @@ void Q3DSStudio3DEngine::Renderer::render()
                 uint id = tex->textureId();
                 QSGImageNode *viewNode = layer.item->node();
                 if (viewNode) {
-                    if (viewNode->texture()->textureId() != id || viewNode->rect().size() != layer.size) {
+                    if (uint(viewNode->texture()->textureId()) != id || viewNode->rect().size() != layer.size) {
                         QSGTexture *t = w->createTextureFromId(id, layer.size, QQuickWindow::TextureHasAlphaChannel);
                         t->setFiltering(QSGTexture::Linear);
 
diff --git a/src/runtime/aping/q3dsstudio3dengine_p.h b/src/runtime/aping/q3dsstudio3dengine_p.h
index 5920fad..d802dd1 100644
--- a/src/runtime/aping/q3dsstudio3dengine_p.h
+++ b/src/runtime/aping/q3dsstudio3dengine_p.h
@@ -43,6 +43,7 @@
 
 #include <Qt3DStudioRuntime2/private/q3dsruntimeglobal_p.h>
 #include <QQuickItem>
+#include <Qt3DCore/QNodeId>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/runtime/profileui/q3dsimguiitem.cpp b/src/runtime/profileui/q3dsimguiitem.cpp
index 430c600..40f55c6 100644
--- a/src/runtime/profileui/q3dsimguiitem.cpp
+++ b/src/runtime/profileui/q3dsimguiitem.cpp
@@ -41,6 +41,8 @@
 #include <QGuiApplication>
 #include <imgui.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype Studio3DProfiler
     \instantiates Q3DSImGuiItem
@@ -595,3 +597,5 @@ void Q3DSImGuiItem::updateInput()
         w->keyText.clear();
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/runtime/profileui/q3dsimguiitem_p.h b/src/runtime/profileui/q3dsimguiitem_p.h
index f2ae182..fbc2103 100644
--- a/src/runtime/profileui/q3dsimguiitem_p.h
+++ b/src/runtime/profileui/q3dsimguiitem_p.h
@@ -47,6 +47,9 @@
 #include <QSGRenderNode>
 
 struct ImGuiContext;
+
+QT_BEGIN_NAMESPACE
+
 class QOpenGLTexture;
 class QOpenGLShaderProgram;
 class QOpenGLBuffer;
@@ -143,4 +146,6 @@ private:
     QObject m_dummy;
 };
 
+QT_END_NAMESPACE
+
 #endif