diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 16:28:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:33 +0200 |
| commit | bdb27b96acbd38531879378c48959a5a1cd60963 (patch) | |
| tree | 056f2c8c35be97a9564dee5d0ea65bed7265b7ce /src/quick/util | |
| parent | 8d26084ae56ba5aedd73ab733553dbf9cb3eb672 (diff) | |
Use ReturnedValue for Managed::get().
Change-Id: Ia8f35d227b69d32e1f6a041283abbbd083aa34ca
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 117b89e88b..1af04505b3 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -326,17 +326,17 @@ public: QV4::ExecutionEngine *v4 = obj->engine(); - QV4::Value vbold = obj->get(v4->newString(QStringLiteral("bold"))); - QV4::Value vcap = obj->get(v4->newString(QStringLiteral("capitalization"))); - QV4::Value vfam = obj->get(v4->newString(QStringLiteral("family"))); - QV4::Value vital = obj->get(v4->newString(QStringLiteral("italic"))); - QV4::Value vlspac = obj->get(v4->newString(QStringLiteral("letterSpacing"))); - QV4::Value vpixsz = obj->get(v4->newString(QStringLiteral("pixelSize"))); - QV4::Value vpntsz = obj->get(v4->newString(QStringLiteral("pointSize"))); - QV4::Value vstrk = obj->get(v4->newString(QStringLiteral("strikeout"))); - QV4::Value vundl = obj->get(v4->newString(QStringLiteral("underline"))); - QV4::Value vweight = obj->get(v4->newString(QStringLiteral("weight"))); - QV4::Value vwspac = obj->get(v4->newString(QStringLiteral("wordSpacing"))); + QV4::Value vbold = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("bold")))); + QV4::Value vcap = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("capitalization")))); + QV4::Value vfam = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("family")))); + QV4::Value vital = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("italic")))); + QV4::Value vlspac = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("letterSpacing")))); + QV4::Value vpixsz = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("pixelSize")))); + QV4::Value vpntsz = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("pointSize")))); + QV4::Value vstrk = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("strikeout")))); + QV4::Value vundl = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("underline")))); + QV4::Value vweight = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("weight")))); + QV4::Value vwspac = QV4::Value::fromReturnedValue(obj->get(v4->newString(QStringLiteral("wordSpacing")))); // pull out the values, set ok to true if at least one valid field is given. if (vbold.isBoolean()) { |