summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-06 17:54:32 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-10 17:56:02 +0000
commitb80788b41baa1bcbf1c09a09056988f768161513 (patch)
tree3ba5ff4b5a88ac6cbadb9950cef9796333f75187
parent39e593232f960d8d6e08c97a5a16305524c5fa23 (diff)
downloadqt3d-b80788b41baa1bcbf1c09a09056988f768161513.tar.gz
quick3drender plugin: Disambiguate meta type id constants
Make them function-local to prevent clashes in CMake Unity (Jumbo) builds, Task-number: QTBUG-109394 Change-Id: I3c42d2b2f45f5aef5f63ced4f68911d6d34a2884 Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 8a0d1556600e8763e14bb0a9d3cd1a778acded3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick3d/quick3drender/items/quick3dparameter.cpp6
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdata.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp
index 7f4147ef1..6fb1f144e 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp
@@ -12,10 +12,6 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-namespace {
-const int qjsValueTypeId = qMetaTypeId<QJSValue>();
-}
-
Quick3DParameterPrivate::Quick3DParameterPrivate()
: QParameterPrivate()
{
@@ -23,6 +19,8 @@ Quick3DParameterPrivate::Quick3DParameterPrivate()
void Quick3DParameterPrivate::setValue(const QVariant &value)
{
+ static const int qjsValueTypeId = qMetaTypeId<QJSValue>();
+
if (value.userType() == qjsValueTypeId) {
QJSValue v = value.value<QJSValue>();
if (v.isArray())
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index d03c900c1..8f92fb8f3 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -14,8 +14,6 @@ namespace Render {
namespace Quick {
namespace {
-
-const int qjsValueTypeId = qMetaTypeId<QJSValue>();
const int quick3DShaderDataArrayTypeId = qMetaTypeId<Quick3DShaderDataArray*>();
Q_DECL_UNUSED const int quick3DShaderDataTypeId = qMetaTypeId<Quick3DShaderData*>();
@@ -30,6 +28,8 @@ public:
QVariant readProperty(const QVariant &v) override
{
+ static const int qjsValueTypeId = qMetaTypeId<QJSValue>();
+
// qjsValueTypeId are not compile time constant (no switch)
if (v.userType() == qjsValueTypeId) {
QJSValue jsValue = v.value<QJSValue>();