aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-03-18 14:20:55 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2021-03-19 10:29:14 +0100
commit01bfe33d56808344f12ad17f900395e85de84de5 (patch)
tree2f0cb2e16660cd0ce31e07657bea81c40683c1e4 /src/quicktemplates2
parent10d73f5478ab6456774b58bb2badbbdd9a0e73d5 (diff)
Remove references to Q_QML_PRIVATE_API_VERSION
Change-Id: I476fd6dc9bb87dc95265bd92dbb6beeb684644f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r--src/quicktemplates2/qquickdeferredexecute.cpp7
-rw-r--r--src/quicktemplates2/qquickstackelement.cpp5
2 files changed, 0 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquickdeferredexecute.cpp b/src/quicktemplates2/qquickdeferredexecute.cpp
index 89f08042..89605e04 100644
--- a/src/quicktemplates2/qquickdeferredexecute.cpp
+++ b/src/quicktemplates2/qquickdeferredexecute.cpp
@@ -93,18 +93,11 @@ static bool beginDeferred(QQmlEnginePrivate *enginePriv, const QQmlProperty &pro
std::deque<const QV4::CompiledData::Binding *> reversedBindings;
std::copy(range.first, range.second, std::front_inserter(reversedBindings));
-#if Q_QML_PRIVATE_API_VERSION < 7
- for (const QV4::CompiledData::Binding *binding : reversedBindings) {
- if (!state->creator->populateDeferredBinding(property, deferData, binding))
- state->errors << state->creator->errors;
- }
-#else
state->creator->beginPopulateDeferred(deferData->context);
for (const QV4::CompiledData::Binding *binding : reversedBindings)
state->creator->populateDeferredBinding(property, deferData->deferredIdx, binding);
state->creator->finalizePopulateDeferred();
state->errors << state->creator->errors;
-#endif
deferredState->constructionStates += state;
diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp
index 4c14022a..1b4ac476 100644
--- a/src/quicktemplates2/qquickstackelement.cpp
+++ b/src/quicktemplates2/qquickstackelement.cpp
@@ -44,7 +44,6 @@
#include <QtQml/private/qv4qobjectwrapper_p.h>
#include <QtQml/private/qqmlcomponent_p.h>
#include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qqmlapiversion_p.h>
QT_BEGIN_NAMESPACE
@@ -211,12 +210,8 @@ void QQuickStackElement::initialize()
QV4::ScopedValue ipv(scope, properties.value());
QV4::Scoped<QV4::QmlContext> qmlContext(scope, qmlCallingContext.value());
QV4::ScopedValue qmlObject(scope, QV4::QObjectWrapper::wrap(v4, item));
-#if Q_QML_PRIVATE_API_VERSION >= 6
RequiredProperties requiredPropertiesCurrentlyNotSupported;
QQmlComponentPrivate::setInitialProperties(v4, qmlContext, qmlObject, ipv, requiredPropertiesCurrentlyNotSupported, item);
-#else
- QQmlComponentPrivate::setInitialProperties(v4, qmlContext, qmlObject, ipv);
-#endif
properties.clear();
}