summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-04-07 15:21:46 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-04-07 15:21:46 +0300
commitd2d93cc3bf911f82431bdc5908219add8291a6f8 (patch)
tree6715b6df5e3ce52c981dfdca9160a57b00572acd
parentcd8f66a15ed63ea80ca66ebe30f1a3fe75fb29eb (diff)
parent6e4e2c9864364a753e986a5c9024fbb0496cb1e3 (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl5.15
-rw-r--r--.qmake.conf2
-rw-r--r--src/render/backend/managers_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index a17c06927..945e128be 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,4 +6,4 @@ load(qt_build_config)
DEFINES += QT_NO_FOREACH
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.4
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index a3d42d24a..864c168be 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -200,7 +200,7 @@ public:
class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderManager : public Qt3DCore::QResourceManager<
Shader,
Qt3DCore::QNodeId,
- Qt3DCore::NonLockingPolicy>
+ Qt3DCore::ObjectLevelLockingPolicy>
{
public:
ShaderManager() {}