diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-17 12:12:57 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-17 20:59:24 +0100 |
| commit | a1c1ad11ce6f4a415cefc583cfab41336ecf71e3 (patch) | |
| tree | e552ec08455f29fe37c3866f3fd1b7456f1ab48b /src/qmlmodels/qqmlinstantiator.cpp | |
| parent | c9380aa42805cf55736dc87c87149d912282c0ae (diff) | |
Instantiator: Do not load items when inactive
Instantiator would react to model changes even when inactive, causing
instances to be errorneously created.
We simply skip doing anything when inactive, as setting the Instantiator
to active later will trigger a full regenaration anyway.
Pick-to: 6.2 5.15
Fixes: QTBUG-86453
Fixes: QTBUG-88331
Change-Id: Ia5fd916bbd591d5fc72c550424b1a53a142c2fa8
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmlmodels/qqmlinstantiator.cpp')
| -rw-r--r-- | src/qmlmodels/qqmlinstantiator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmlmodels/qqmlinstantiator.cpp b/src/qmlmodels/qqmlinstantiator.cpp index 3b663badf5..cb7ca1126c 100644 --- a/src/qmlmodels/qqmlinstantiator.cpp +++ b/src/qmlmodels/qqmlinstantiator.cpp @@ -147,7 +147,7 @@ void QQmlInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &changeSet, bo { Q_Q(QQmlInstantiator); - if (!componentComplete || effectiveReset) + if (!componentComplete || effectiveReset || !active) return; if (reset) { |