diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index ea6a63559a..b5ae41daef 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -112,6 +112,8 @@ void QQuickLoaderPrivate::clear() q, SIGNAL(progressChanged())); component->deleteLater(); component = nullptr; + } else if (component) { + component = nullptr; } componentStrongReference.clear(); source = QUrl(); @@ -438,7 +440,8 @@ void QQuickLoader::loadFromSource() if (isComponentComplete()) { QQmlComponent::CompilationMode mode = d->asynchronous ? QQmlComponent::Asynchronous : QQmlComponent::PreferSynchronous; - d->component = new QQmlComponent(qmlEngine(this), d->source, mode, this); + if (!d->component) + d->component = new QQmlComponent(qmlEngine(this), d->source, mode, this); d->load(); } } @@ -828,7 +831,8 @@ void QQuickLoader::componentComplete() if (active()) { if (d->loadingFromSource) { QQmlComponent::CompilationMode mode = d->asynchronous ? QQmlComponent::Asynchronous : QQmlComponent::PreferSynchronous; - d->component = new QQmlComponent(qmlEngine(this), d->source, mode, this); + if (!d->component) + d->component = new QQmlComponent(qmlEngine(this), d->source, mode, this); } d->load(); } |