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

Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21

1 files changed, 10 insertions, 7 deletions

diff --git a/src/quick/designer/qqmldesignermetaobject.cpp b/src/quick/designer/qqmldesignermetaobject.cpp
index 46808f978b..0bfa72e9d4 100644
--- a/src/quick/designer/qqmldesignermetaobject.cpp
+++ b/src/quick/designer/qqmldesignermetaobject.cpp
@@ -140,9 +140,13 @@ void QQmlDesignerMetaObject::init(QObject *object, QQmlEngine *engine)
     QObjectPrivate *op = QObjectPrivate::get(object);
     op->metaObject = this;
 
-    //create cache
-    cache = m_cache = QQmlEnginePrivate::get(engine)->cache(this);
-    cache->addref();
+    m_cache = QQmlEnginePrivate::get(engine)->cache(this);
+
+    if (m_cache != cache) {
+        m_cache->addref();
+        cache->release();
+        cache = m_cache;
+    }
 
     //If our parent is not a VMEMetaObject we just se the flag to false again
     if (constructedMetaData(metaData))
@@ -166,17 +170,16 @@ QQmlDesignerMetaObject::QQmlDesignerMetaObject(QObject *object, QQmlEngine *engi
     if (ddata && ddata->propertyCache) {
         cache->setParent(ddata->propertyCache);
         cache->invalidate(engine, this);
+        ddata->propertyCache->release();
         ddata->propertyCache = m_cache;
+        m_cache->addref();
     }
 
 }
 
 QQmlDesignerMetaObject::~QQmlDesignerMetaObject()
 {
-    if (cache->count() > 1) // qml is crashing because the property cache is not removed from the engine
-        cache->release();
-    else
-        m_type->release();
+    m_type->release();
 
     nodeInstanceMetaObjectList.remove(this);
 }