Merge remote-tracking branch 'origin/5.11' into 5.12

Change-Id: If18e582a7210dae046426d97af530ab7ef47ddf4

dist/changes-5.11.3

@@ -0,0 +1,58 @@
+Qt 5.11.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.2.
+
+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.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+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.
+
+****************************************************************************
+*                              Qt 5.11.3 Changes                           *
+****************************************************************************
+
+****************************************************************************
+*                                  QtQml                                   *
+****************************************************************************
+
+ - [QTBUG-69973] Fixed QML comma operator property lookup failure.
+ - [QTBUG-70350] Fixed allocation of multi-page executable memory for
+   INTEGRITY.
+ - [QTBUG-69996] Fixed undefined behavior in MASM on 64bit architectures.
+ - [QTBUG-70460] Fixed deadlock in qmlplugindump.
+
+****************************************************************************
+*                                 QtQuick                                  *
+****************************************************************************
+
+ - Accessibility: The StaticText role for Text items is now only used if
+   there is no explicit role set.
+ - Scene Graph: Fixed Leaking of resources in the OpenVG backend.
+ - [QTBUG-69290] Fixed leaking of textures and animation resources in
+   software backend.
+ - [QTBUG-58924] Added a warning message for the case of too many tiles in
+   a BorderImage.
+ - [QTBUG-70898] Fixed a crash on nested delivery of mouse or touch presses.
+ - [QTBUG-64402] Fixed a crash in QQuickAnimatorProxyJob.
+ - [QTBUG-69059][QTBUG-61144] Fixed confusion about mouse grabbing when
+   delivering  pointer events to a QQuickWindow.
+ - [QTBUG-59620] Prevented PathView's parent from stealing mouse grabs
+   during double-flick.
+
+****************************************************************************
+*                                Building                                  *
+****************************************************************************
+
+ - [QTBUG-70414] Disabled building of XmlListModel if the "qml-network"
+   feature is unavailable.
+ - Enabled building without the "filesystemwatcher" feature.

src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.cpp

@@ -174,7 +174,7 @@ void QSGOpenVGRectangleNode::render()
 
 }
 
-QSGOpenVGImageNode::QSGOpenVGImageNode()
+QSGOpenVGImageNode::QSGOpenVGImageNode() : m_texture(nullptr), m_owns(false)
 {
     // Set Dummy material and geometry to avoid asserts
     setMaterial((QSGMaterial*)1);
@@ -184,9 +184,8 @@ QSGOpenVGImageNode::QSGOpenVGImageNode()
 
 QSGOpenVGImageNode::~QSGOpenVGImageNode()
 {
-    if (m_owns) {
-        m_texture->deleteLater();
-    }
+    if (m_owns)
+        delete m_texture;
 }
 
 void QSGOpenVGImageNode::setRect(const QRectF &rect)
@@ -212,6 +211,8 @@ QRectF QSGOpenVGImageNode::sourceRect() const
 
 void QSGOpenVGImageNode::setTexture(QSGTexture *texture)
 {
+    if (m_owns)
+        delete m_texture;
     m_texture = texture;
     markDirty(DirtyMaterial);
 }
@@ -321,7 +322,7 @@ void QSGOpenVGImageNode::render()
 
 }
 
-QSGOpenVGNinePatchNode::QSGOpenVGNinePatchNode()
+QSGOpenVGNinePatchNode::QSGOpenVGNinePatchNode() : m_texture(nullptr)
 {
     // Set Dummy material and geometry to avoid asserts
     setMaterial((QSGMaterial*)1);
@@ -329,8 +330,14 @@ QSGOpenVGNinePatchNode::QSGOpenVGNinePatchNode()
 
 }
 
+QSGOpenVGNinePatchNode::~QSGOpenVGNinePatchNode()
+{
+    delete m_texture;
+}
+
 void QSGOpenVGNinePatchNode::setTexture(QSGTexture *texture)
 {
+    delete m_texture;
     m_texture = texture;
     markDirty(DirtyMaterial);
 }

src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h

@@ -118,6 +118,7 @@ class QSGOpenVGNinePatchNode : public QSGNinePatchNode, public QSGOpenVGRenderab
 {
 public:
     QSGOpenVGNinePatchNode();
+    ~QSGOpenVGNinePatchNode();
 
     void setTexture(QSGTexture *texture) override;
     void setBounds(const QRectF &bounds) override;

src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp

@@ -43,6 +43,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QElapsedTimer>
 
+#include <private/qquickanimatorcontroller_p.h>
 #include <private/qquickwindow_p.h>
 #include <private/qquickprofiler_p.h>
 
@@ -94,6 +95,8 @@ void QSGOpenVGRenderLoop::windowDestroyed(QQuickWindow *window)
     } else if (vg && window == vg->window()) {
         vg->doneCurrent();
     }
+
+    delete d->animationController;
 }
 
 void QSGOpenVGRenderLoop::exposureChanged(QQuickWindow *window)

src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp

@@ -156,11 +156,12 @@ void QSGSoftwareNinePatchNode::setTexture(QSGTexture *texture)
     QSGSoftwarePixmapTexture *pt = qobject_cast<QSGSoftwarePixmapTexture*>(texture);
     if (!pt) {
         qWarning() << "Image used with invalid texture format.";
-        return;
-    }
+    } else {
         m_pixmap = pt->pixmap();
         markDirty(DirtyMaterial);
     }
+    delete texture;
+}
 
 void QSGSoftwareNinePatchNode::setBounds(const QRectF &bounds)
 {

src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp

@@ -45,6 +45,7 @@
 
 #include <private/qquickwindow_p.h>
 #include <QElapsedTimer>
+#include <private/qquickanimatorcontroller_p.h>
 #include <private/qquickprofiler_p.h>
 #include <private/qsgsoftwarerenderer_p.h>
 #include <qpa/qplatformbackingstore.h>
@@ -98,6 +99,8 @@ void QSGSoftwareRenderLoop::windowDestroyed(QQuickWindow *window)
     if (m_windows.size() == 0) {
         rc->invalidate();
     }
+
+    delete d->animationController;
 }
 
 void QSGSoftwareRenderLoop::renderWindow(QQuickWindow *window, bool isNewExpose)