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

 Conflicts:
	src/qml/jsruntime/qv4executablecompilationunit.cpp
	src/qml/jsruntime/qv4executablecompilationunit_p.h
	src/qml/qml/qqmlobjectcreator.cpp
	src/qml/qml/qqmlpropertycachecreator_p.h
	src/qml/qml/qqmltypecompiler.cpp
	src/qml/qml/qqmltypedata.cpp
	tests/auto/qml/qmlformat/tst_qmlformat.cpp
	tools/qmllint/scopetree.cpp
	src/qml/qml/qqmlapplicationengine_p.h

Adjusted tools/qmllint/findunqualified.cpp to use newer API

Change-Id: Ibfb4678ca39d626d47527265e3c96e43313873d4

1 files changed, 34 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4resolvedtypereference_p.h b/src/qml/jsruntime/qv4resolvedtypereference_p.h
index 88b77cf2a8..7e8bedad62 100644
--- a/src/qml/jsruntime/qv4resolvedtypereference_p.h
+++ b/src/qml/jsruntime/qv4resolvedtypereference_p.h
@@ -67,6 +67,11 @@ class ResolvedTypeReference
     Q_DISABLE_COPY_MOVE(ResolvedTypeReference)
 public:
     ResolvedTypeReference() = default;
+    ~ResolvedTypeReference()
+    {
+        if (m_stronglyReferencesCompilationUnit && m_compilationUnit)
+            m_compilationUnit->release();
+    }
 
     QQmlRefPointer<QQmlPropertyCache> propertyCache() const;
     QQmlRefPointer<QQmlPropertyCache> createPropertyCache(QQmlEngine *);
@@ -80,7 +85,33 @@ public:
     QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit() { return m_compilationUnit; }
     void setCompilationUnit(QQmlRefPointer<QV4::ExecutableCompilationUnit> unit)
     {
-        m_compilationUnit = std::move(unit);
+        if (m_compilationUnit == unit.data())
+            return;
+        if (m_stronglyReferencesCompilationUnit) {
+            if (m_compilationUnit)
+                m_compilationUnit->release();
+            m_compilationUnit = unit.take();
+        } else {
+            m_compilationUnit = unit.data();
+        }
+    }
+
+    bool referencesCompilationUnit() const { return m_stronglyReferencesCompilationUnit; }
+    void setReferencesCompilationUnit(bool doReference)
+    {
+        if (doReference == m_stronglyReferencesCompilationUnit)
+            return;
+        m_stronglyReferencesCompilationUnit = doReference;
+        if (!m_compilationUnit)
+            return;
+        if (doReference) {
+            m_compilationUnit->addref();
+        } else if (m_compilationUnit->count() == 1) {
+            m_compilationUnit->release();
+            m_compilationUnit = nullptr;
+        } else {
+            m_compilationUnit->release();
+        }
     }
 
     QQmlRefPointer<QQmlPropertyCache> typePropertyCache() const { return m_typePropertyCache; }
@@ -98,12 +129,13 @@ public:
 private:
     QQmlType m_type;
     QQmlRefPointer<QQmlPropertyCache> m_typePropertyCache;
-    QQmlRefPointer<QV4::ExecutableCompilationUnit> m_compilationUnit;
+    QV4::ExecutableCompilationUnit *m_compilationUnit = nullptr;
 
     QTypeRevision m_version = QTypeRevision::zero();
     // Types such as QQmlPropertyMap can add properties dynamically at run-time and
     // therefore cannot have a property cache installed when instantiated.
     bool m_isFullyDynamicType = false;
+    bool m_stronglyReferencesCompilationUnit = true;
 };
 
 } // namespace QV4