diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 15:33:28 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-17 09:21:05 +0000 |
| commit | 22e5f2f64369ffbdcb8184c9b35c946a1d20f4e1 (patch) | |
| tree | cc8de83ba830cbc0376e0b8520b037b9cb898f8f /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | c2b4c6393fee37e0c6c4a8c5d40d13120cc8a94e (diff) | |
Revert "Allow canceling incubation"
This reverts commit ca6b787a01ea289bd5c2a3e4ff3c7442a4ff58fc. This
internal API was added as a workaround for Qt Quick Controls 2. It
is no longer needed now that Qt Quick Controls 2 are using deferred
execution.
Task-number: QTBUG-50992
Change-Id: Iaddf22460f091743e1a68acd16813a28f3e82ecb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 9c6630190f..dfb733f4cb 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1349,21 +1349,6 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru return sharedState->rootContext; } -void QQmlObjectCreator::cancel(QObject *object) -{ - int last = sharedState->allCreatedObjects.count() - 1; - int i = last; - while (i >= 0) { - if (sharedState->allCreatedObjects.at(i) == object) { - if (i < last) - qSwap(sharedState->allCreatedObjects[i], sharedState->allCreatedObjects[last]); - sharedState->allCreatedObjects.pop(); - break; - } - --i; - } -} - void QQmlObjectCreator::clear() { if (phase == Done || phase == Finalizing || phase == Startup) |