summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-06-29 09:08:11 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-06-29 07:30:52 +0000
commitdbb81a15297f21bd4a5e3271dfdf66bd507333ed (patch)
treed62fd4b66bf746557f7394f6b305dfc05222afba /src
parent1acbd8b24046bce1f1178f9eb7d5ad96e5abed97 (diff)
Remove private API guards
After commit 26dd89e493e0957a4086798970b017afe0e932d5 in qt5.git we can remove the guards as the old API is not available anymore. Change-Id: I437f14eec4df74775efb66dc004344e4af068e1a Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/scxml/qscxmlecmascriptdatamodel.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/scxml/qscxmlecmascriptdatamodel.cpp b/src/scxml/qscxmlecmascriptdatamodel.cpp
index 810140e..7222291 100644
--- a/src/scxml/qscxmlecmascriptdatamodel.cpp
+++ b/src/scxml/qscxmlecmascriptdatamodel.cpp
@@ -323,11 +323,7 @@ private: // Uses private API
return SetPropertyFailedForAnotherReason;
}
-#if defined(Q_QML_PRIVATE_API_VERSION) && Q_QML_PRIVATE_API_VERSION >= 1
QV4::PropertyAttributes attrs = o->getOwnProperty(s->toPropertyKey());
-#else
- QV4::PropertyAttributes attrs = o->query(s);
-#endif
if (attrs.isWritable() || attrs.isEmpty()) {
QV4::ScopedValue v(scope, QJSValuePrivate::convertedToValue(engine, value));
o->insertMember(s, v);