summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:00:38 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:00:38 +0200
commite9642824244fa9fe55dca2cef8e002192a4f1b17 (patch)
tree73a78a99253fb040e8a3be9d2b85566b662a500e
parent06f41f15abaacc9f6f7acb8e51d2cfb68705a924 (diff)
parent6f80588bb7be82117b0d2406a61bda9ca6dfbec3 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
-rw-r--r--src/core/qscene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp
index 9624aec64..c94272e90 100644
--- a/src/core/qscene.cpp
+++ b/src/core/qscene.cpp
@@ -57,8 +57,8 @@ public:
QScenePrivate(QAspectEngine *engine)
: m_engine(engine)
, m_arbiter(nullptr)
- , m_rootNode(nullptr)
, m_postConstructorInit(new NodePostConstructorInit)
+ , m_rootNode(nullptr)
{
}