Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
This commit is contained in:
Liang Qi 2017-08-15 12:22:32 +02:00
commit c54adde27f
2 changed files with 25 additions and 1 deletions

24
dist/changes-5.9.1 vendored Normal file
View File

@ -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.

View File

@ -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);