diff options
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 11 | ||||
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmldelayedcallqueue.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlfileselector.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlglobal.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlloggingcategory.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmltypenotavailable.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 2 |
13 files changed, 34 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index a10dda166c..faab8bf926 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -57,6 +57,10 @@ QQmlApplicationEnginePrivate::~QQmlApplicationEnginePrivate() void QQmlApplicationEnginePrivate::cleanUp() { + Q_Q(QQmlApplicationEngine); + for (auto obj : qAsConst(objects)) + obj->disconnect(q); + qDeleteAll(objects); #if QT_CONFIG(translation) qDeleteAll(translators); @@ -126,9 +130,12 @@ void QQmlApplicationEnginePrivate::finishLoad(QQmlComponent *c) qWarning() << qPrintable(c->errorString()); q->objectCreated(0, c->url()); break; - case QQmlComponent::Ready: - objects << c->create(); + case QQmlComponent::Ready: { + auto newObj = c->create(); + objects << newObj; + QObject::connect(newObj, &QObject::destroyed, q, [&](QObject *obj) { objects.removeAll(obj); }); q->objectCreated(objects.constLast(), c->url()); + } break; case QQmlComponent::Loading: case QQmlComponent::Null: diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 75968ffc43..9b965a52fb 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1527,3 +1527,5 @@ void QV4::QmlIncubatorObject::statusChanged(QQmlIncubator::Status s) #undef INITIALPROPERTIES_SOURCE QT_END_NAMESPACE + +#include "moc_qqmlcomponent.cpp" diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index 018841b9b1..1476c276f4 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -834,3 +834,5 @@ QString QQmlContextData::urlString() const } QT_END_NAMESPACE + +#include "moc_qqmlcontext.cpp" diff --git a/src/qml/qml/qqmldelayedcallqueue.cpp b/src/qml/qml/qqmldelayedcallqueue.cpp index d5d2c9a28d..13e62ec696 100644 --- a/src/qml/qml/qqmldelayedcallqueue.cpp +++ b/src/qml/qml/qqmldelayedcallqueue.cpp @@ -210,3 +210,5 @@ void QQmlDelayedCallQueue::ticked() } QT_END_NAMESPACE + +#include "moc_qqmldelayedcallqueue_p.cpp" diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 9ff76d7b24..74b03c9f72 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2177,7 +2177,7 @@ QString QQmlEngine::offlineStoragePath() const Returns the file path where a \l{QtQuick.LocalStorage}{Local Storage} database with the identifier \a databaseName is (or would be) located. - \sa LocalStorage.openDatabaseSync() + \sa {openDatabaseSync}{LocalStorage.openDatabaseSync()} \since 5.9 */ QString QQmlEngine::offlineStorageDatabaseFilePath(const QString &databaseName) const @@ -2553,3 +2553,5 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) */ QT_END_NAMESPACE + +#include "moc_qqmlengine.cpp" diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index 097fa71200..b0e6a24616 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -128,3 +128,5 @@ void QQmlExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri) */ QT_END_NAMESPACE + +#include "moc_qqmlextensionplugin.cpp" diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp index 461ca33b3e..be6216d3ff 100644 --- a/src/qml/qml/qqmlfileselector.cpp +++ b/src/qml/qml/qqmlfileselector.cpp @@ -222,3 +222,5 @@ QUrl QQmlFileSelectorInterceptor::intercept(const QUrl &path, DataType type) } QT_END_NAMESPACE + +#include "moc_qqmlfileselector.cpp" diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index f967dacd34..7939656107 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -450,3 +450,5 @@ void QQmlApplication::setDomain(const QString &arg) } QT_END_NAMESPACE + +#include "moc_qqmlglobal_p.cpp" diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 712da78807..326b36c5cd 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -1090,3 +1090,5 @@ void QQmlLocale::method_localeCompare(const BuiltinFunction *b, Scope &scope, Ca */ QT_END_NAMESPACE + +#include "moc_qqmllocale_p.cpp" diff --git a/src/qml/qml/qqmlloggingcategory.cpp b/src/qml/qml/qqmlloggingcategory.cpp index 764b874131..08f8552ab6 100644 --- a/src/qml/qml/qqmlloggingcategory.cpp +++ b/src/qml/qml/qqmlloggingcategory.cpp @@ -126,3 +126,5 @@ void QQmlLoggingCategory::setName(const QString &name) QScopedPointer<QLoggingCategory> category(new QLoggingCategory(m_name.constData())); m_category.swap(category); } + +#include "moc_qqmlloggingcategory_p.cpp" diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index 64ca208f1b..165cde5eb3 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -79,3 +79,5 @@ QString QQmlPlatform::os() } QT_END_NAMESPACE + +#include "moc_qqmlplatform_p.cpp" diff --git a/src/qml/qml/qqmltypenotavailable.cpp b/src/qml/qml/qqmltypenotavailable.cpp index b10a7c62b9..ffa4472e4b 100644 --- a/src/qml/qml/qqmltypenotavailable.cpp +++ b/src/qml/qml/qqmltypenotavailable.cpp @@ -49,3 +49,5 @@ int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMi QQmlTypeNotAvailable::QQmlTypeNotAvailable() { } QT_END_NAMESPACE + +#include "moc_qqmltypenotavailable_p.cpp" diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index bcefad0ee3..520f512b1a 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -566,3 +566,5 @@ QVariantList QQmlEasingValueType::bezierCurve() const } QT_END_NAMESPACE + +#include "moc_qqmlvaluetype_p.cpp" |