mirror of https://github.com/qt/qtdatavis3d.git
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
This commit is contained in:
commit
c54adde27f
|
|
@ -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.
|
||||||
|
|
@ -63,7 +63,7 @@ AbstractDeclarative::AbstractDeclarative(QQuickItem *parent) :
|
||||||
m_mainThread(QThread::currentThread()),
|
m_mainThread(QThread::currentThread()),
|
||||||
m_contextThread(0)
|
m_contextThread(0)
|
||||||
{
|
{
|
||||||
m_nodeMutex = QSharedPointer<QMutex>(new QMutex);
|
m_nodeMutex = QSharedPointer<QMutex>::create();
|
||||||
|
|
||||||
connect(this, &QQuickItem::windowChanged, this, &AbstractDeclarative::handleWindowChanged);
|
connect(this, &QQuickItem::windowChanged, this, &AbstractDeclarative::handleWindowChanged);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue