diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-18 13:16:55 +0000 |
| commit | 67b6389c0f4a45fd72e5a6a2eb129aa5c907c8d1 (patch) | |
| tree | 2b8a97efe6c19e2c6729e749f38f07b2fd899a39 /src | |
| parent | 08b1fc642b2792813589e2c1a77ba5af8e2f2d38 (diff) | |
Remove compatibility code for private QML API
The old code is not needed anymore now that qt5.git is up-to-date.
Change-Id: I4d7a76e338205d0e3b685bc3bba56aa609bbdeeb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmlecmascriptdatamodel.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/scxml/qscxmlecmascriptdatamodel.cpp b/src/scxml/qscxmlecmascriptdatamodel.cpp index 92e3cec..da4fe84 100644 --- a/src/scxml/qscxmlecmascriptdatamodel.cpp +++ b/src/scxml/qscxmlecmascriptdatamodel.cpp @@ -283,20 +283,12 @@ private: // Uses private API } QV4::ScopedString s(scope, engine->newString(name)); -#if Q_QML_PRIVATE_API_VERSION < 2 - uint idx = s->asArrayIndex(); - if (idx < UINT_MAX) { -#else QV4::ScopedPropertyKey key(scope, s->toPropertyKey()); if (key->isArrayIndex()) { -#endif Q_UNIMPLEMENTED(); return; } -#if Q_QML_PRIVATE_API_VERSION < 2 - s->makeIdentifier(); -#endif QV4::ScopedValue v(scope, QJSValuePrivate::convertedToValue(engine, value)); o->defineReadonlyProperty(s, v); if (engine->hasException) @@ -324,13 +316,8 @@ private: // Uses private API } QV4::ScopedString s(scope, engine->newString(name)); -#if Q_QML_PRIVATE_API_VERSION < 2 - uint idx = s->asArrayIndex(); - if (idx < UINT_MAX) { -#else QV4::ScopedPropertyKey key(scope, s->toPropertyKey()); if (key->isArrayIndex()) { -#endif Q_UNIMPLEMENTED(); return SetPropertyFailedForAnotherReason; } |