Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	tools/qml/main.cpp

Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842

2 files changed, 8 insertions, 1 deletions

diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 0076c26950..4b64f24806 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -210,7 +210,7 @@ public:
     \inqmlmodule QtQuick
     \brief Defines a set of objects to be used as a model
 
-    The VisualItemModel type encapsulates contains the objects to be used
+    The VisualItemModel type contains the objects to be used
     as a model.
 
     This element is now primarily available as ObjectModel in the QtQml.Models module.
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index a77bfd17d3..0b7b5ce9a8 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -137,6 +137,7 @@ public:
     class Event : public QEvent {
     public:
         Event(ReadError, const QString &, const QSize &, AutoTransform, QQuickTextureFactory *factory);
+        ~Event();
 
         ReadError error;
         QString errorString;
@@ -331,6 +332,11 @@ QQuickPixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSiz
 {
 }
 
+QQuickPixmapReply::Event::~Event()
+{
+    delete textureFactory;
+}
+
 QNetworkAccessManager *QQuickPixmapReader::networkAccessManager()
 {
     if (!accessManager) {
@@ -1021,6 +1027,7 @@ bool QQuickPixmapReply::event(QEvent *event)
             data->pixmapStatus = (de->error == NoError) ? QQuickPixmap::Ready : QQuickPixmap::Error;
             if (data->pixmapStatus == QQuickPixmap::Ready) {
                 data->textureFactory = de->textureFactory;
+                de->textureFactory = 0;
                 data->implicitSize = de->implicitSize;
                 data->appliedTransform = de->autoTransform;
                 PIXMAP_PROFILE(pixmapLoadingFinished(data->url,