diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-03-30 11:08:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 07:40:21 +0200 |
| commit | ab45c8da80968c4fabdb121c7eea48164d2216ff (patch) | |
| tree | 72dfc10d75f608f706721d49fee2feb15dde65ed /src/quick/items/qquickvisualdatamodel.cpp | |
| parent | b8f6e3736cf5b73b695d4820a35663fa18708981 (diff) | |
When async loading a view, ensure its delegates are also async.
We were forcing a sync incubation the second time the item was
requested synchronously, breaking nested async creation. The
incubation should only be forced if previously the item was
requested async.
Change-Id: Id2aff97222d7b1262b502994d3f9c0f009a7a909
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickvisualdatamodel.cpp')
| -rw-r--r-- | src/quick/items/qquickvisualdatamodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp index 88d46c60ee..cea83969f3 100644 --- a/src/quick/items/qquickvisualdatamodel.cpp +++ b/src/quick/items/qquickvisualdatamodel.cpp @@ -803,7 +803,7 @@ QObject *QQuickVisualDataModelPrivate::object(Compositor::Group group, int index } if (cacheItem->incubationTask) { - if (!asynchronous) { + if (!asynchronous && cacheItem->incubationTask->incubationMode() == QQmlIncubator::Asynchronous) { // previously requested async - now needed immediately cacheItem->incubationTask->forceCompletion(); } |