summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-08-15 12:22:32 +0200
committerLiang Qi <liang.qi@qt.io>2017-08-15 13:07:25 +0200
commitc54adde27f5aa723882ffc5f77fae86b3793b6e2 (patch)
tree06b0c81cf0090bd10539b0208a9b1eba41411461 /src
parentd8c81e5db3e5aefd87f3f4e552eb791d84ad3d3d (diff)
parent3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f (diff)
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1
Conflicts: .qmake.conf Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
Diffstat (limited to 'src')
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 5a8f0535..03d1f41d 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -63,7 +63,7 @@ AbstractDeclarative::AbstractDeclarative(QQuickItem *parent) :
m_mainThread(QThread::currentThread()),
m_contextThread(0)
{
- m_nodeMutex = QSharedPointer<QMutex>(new QMutex);
+ m_nodeMutex = QSharedPointer<QMutex>::create();
connect(this, &QQuickItem::windowChanged, this, &AbstractDeclarative::handleWindowChanged);