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

Conflicts:
	examples/quick/textureprovider/etcprovider.h
	src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
	src/qml/doc/qtqml.qdocconf
	src/quick/doc/qtquick.qdocconf
	tests/auto/quick/qquickflickable/tst_qquickflickable.cpp

Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4

2 files changed, 4 insertions, 2 deletions

diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index fb75a7669e..4e3748f78f 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -52,7 +52,7 @@ public:
 
 /*!
     \class QQuickTextureFactory
-    \since 5.0
+    \since QtQuick 2.0
     \brief The QQuickTextureFactory class provides an interface for loading custom textures from QML.
     \inmodule QtQuick
 
@@ -127,7 +127,7 @@ QImage QQuickTextureFactory::image() const
 
 /*!
     \class QQuickImageProvider
-    \since 5.0
+    \since QtQuick 2.0
     \inmodule QtQuick
     \brief The QQuickImageProvider class provides an interface for supporting pixmaps and threaded image requests in QML.
 
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index e43c5e9b71..dda2fbe2b0 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -565,6 +565,8 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u
             mutex.lock();
             if (!cancelled.contains(runningJob))
                 runningJob->postReply(errorCode, errorStr, readSize, t);
+            else
+                delete t;
             mutex.unlock();
 
         }