diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:22:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:07:25 +0200 |
commit | c54adde27f5aa723882ffc5f77fae86b3793b6e2 (patch) | |
tree | 06b0c81cf0090bd10539b0208a9b1eba41411461 | |
parent | d8c81e5db3e5aefd87f3f4e552eb791d84ad3d3d (diff) | |
parent | 3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f (diff) |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
-rw-r--r-- | dist/changes-5.9.1 | 24 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 00000000..e0a6a4b9 --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,24 @@ +Qt 5.9.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. 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); |