diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-25 12:24:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:24 +0200 |
| commit | cf2a253f2f60c9f0c61682527d80143e72b355d4 (patch) | |
| tree | d60e8be50437e6f15513e25155817b902a2062c7 /src/qml/qml/qqmlvme.cpp | |
| parent | 7872b380063d0497ba62fecfdc92148f1ea947af (diff) | |
Move Value::fromBool, ... to a new Primitive class
This will simplify finding the remaining direct usages of
QV4::Value that need fixing.
Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 3b88e148c7..512b9b4674 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -421,9 +421,9 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, // Store a literal value in a var property. // We deliberately do not use string converters here QML_STORE_VAR(StoreVar, QV4::Value::fromReturnedValue(ep->v8engine()->fromVariant(PRIMITIVES.at(instr.value)))); - QML_STORE_VAR(StoreVarInteger, QV4::Value::fromInt32(instr.value)); - QML_STORE_VAR(StoreVarDouble, QV4::Value::fromDouble(instr.value)); - QML_STORE_VAR(StoreVarBool, QV4::Value::fromBoolean(instr.value)); + QML_STORE_VAR(StoreVarInteger, QV4::Primitive::fromInt32(instr.value)); + QML_STORE_VAR(StoreVarDouble, QV4::Primitive::fromDouble(instr.value)); + QML_STORE_VAR(StoreVarBool, QV4::Primitive::fromBoolean(instr.value)); // Store a literal value in a QJSValue property. QML_STORE_VALUE(StoreJSValueString, QJSValue, QJSValue(PRIMITIVES.at(instr.value))); |