fix unity builds

* `Q_DECLARE_OPAQUE_POINTER` in header to avoid 'specialisation after
instantiation'
* prevent name clash of `ensureNormalized`

Change-Id: I3fcbff6a16b29e2105d094c33944021a1a1afe24
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 918e778e2a3c96d2591e666e1f94473fc857fe01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 6 insertions, 8 deletions

diff --git a/src/quick3d/CMakeLists.txt b/src/quick3d/CMakeLists.txt
index eebd4b28..b4415776 100644
--- a/src/quick3d/CMakeLists.txt
+++ b/src/quick3d/CMakeLists.txt
@@ -63,8 +63,6 @@ qt_internal_add_module(Quick3D
         qquick3dlightmapbaker.cpp qquick3dlightmapbaker_p.h
         extensions/qquick3drenderextensions.cpp extensions/qquick3drenderextensions.h
         extensions/qquick3dextensionhelpers.cpp extensions/qquick3dextensionhelpers.h
-    NO_UNITY_BUILD_SOURCES
-        qquick3dspecularglossymaterial.cpp # redefinition of 'ensureNormalized' (from qquick3dprincipledmaterial.cpp)
     SSG_HEADER_FILTERS
         "(^|/)qquick3dextensionhelpers\\.h$"
     DEFINES
diff --git a/src/quick3d/qquick3dcustommaterial.cpp b/src/quick3d/qquick3dcustommaterial.cpp
index 7e7f6d69..2964cc5d 100644
--- a/src/quick3d/qquick3dcustommaterial.cpp
+++ b/src/quick3d/qquick3dcustommaterial.cpp
@@ -11,8 +11,6 @@
 #include "qquick3dviewport_p.h"
 #include "qquick3dscenemanager_p.h"
 
-Q_DECLARE_OPAQUE_POINTER(QQuick3DShaderUtilsTextureInput)
-
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/quick3d/qquick3dprincipledmaterial.cpp b/src/quick3d/qquick3dprincipledmaterial.cpp
index 30cf7fda..823cb922 100644
--- a/src/quick3d/qquick3dprincipledmaterial.cpp
+++ b/src/quick3d/qquick3dprincipledmaterial.cpp
@@ -712,8 +712,6 @@ QT_BEGIN_NAMESPACE
     material. The default value is true.
 */
 
-inline static float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
-
 QQuick3DPrincipledMaterial::QQuick3DPrincipledMaterial(QQuick3DObject *parent)
     : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::PrincipledMaterial)), parent)
 {}
diff --git a/src/quick3d/qquick3dprincipledmaterial_p.h b/src/quick3d/qquick3dprincipledmaterial_p.h
index 93c2760d..b01e58a9 100644
--- a/src/quick3d/qquick3dprincipledmaterial_p.h
+++ b/src/quick3d/qquick3dprincipledmaterial_p.h
@@ -385,6 +385,8 @@ private:
 
     quint32 m_dirtyAttributes = 0xffffffff; // all dirty by default
     void markDirty(DirtyType type);
+
+    static constexpr float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/qquick3dshaderutils_p.h b/src/quick3d/qquick3dshaderutils_p.h
index 8f9c92c8..abec6dfa 100644
--- a/src/quick3d/qquick3dshaderutils_p.h
+++ b/src/quick3d/qquick3dshaderutils_p.h
@@ -278,4 +278,6 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_OPAQUE_POINTER(QQuick3DShaderUtilsTextureInput)
+
 #endif // QQUICK3DSHADERUTILS_H
diff --git a/src/quick3d/qquick3dspecularglossymaterial.cpp b/src/quick3d/qquick3dspecularglossymaterial.cpp
index b164c581..bdd67ce0 100644
--- a/src/quick3d/qquick3dspecularglossymaterial.cpp
+++ b/src/quick3d/qquick3dspecularglossymaterial.cpp
@@ -581,8 +581,6 @@ QT_BEGIN_NAMESPACE
     material. The default value is true.
 */
 
-inline static float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
-
 QQuick3DSpecularGlossyMaterial::QQuick3DSpecularGlossyMaterial(QQuick3DObject *parent)
     : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::SpecularGlossyMaterial)), parent)
 {}
diff --git a/src/quick3d/qquick3dspecularglossymaterial_p.h b/src/quick3d/qquick3dspecularglossymaterial_p.h
index af3c9b25..16e0d495 100644
--- a/src/quick3d/qquick3dspecularglossymaterial_p.h
+++ b/src/quick3d/qquick3dspecularglossymaterial_p.h
@@ -343,6 +343,8 @@ private:
 
     quint32 m_dirtyAttributes = 0xffffffff; // all dirty by default
     void markDirty(DirtyType type);
+
+    static constexpr float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
 };
 
 QT_END_NAMESPACE