diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-09 14:33:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 21:52:00 +0200 |
| commit | a723c7ae756ba567c2f818bb77a83c24373d3438 (patch) | |
| tree | 0508a1c1526e56a7aa3c4a3055c8a4b65a973b06 /src/quick/items/qquickitem.cpp | |
| parent | bf22c55036f6429ccfc849ea71f33e757fae47fa (diff) | |
Use a ReturnedValue when converting to String or Object
Also rename Value::toQString() to Value::toQStringNoThrow(),
and add a throwing toQString() method for JS use.
Change-Id: I821b33fc61abb7d08839df965fd337685f61a545
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 01625756cd..d27a964e4e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3871,7 +3871,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const } if (!itemObj && !item.isNull()) { - qmlInfo(this) << "mapFromItem() given argument \"" << item.toQString() + qmlInfo(this) << "mapFromItem() given argument \"" << item.toQStringNoThrow() << "\" which is neither null nor an Item"; return; } @@ -3945,7 +3945,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const } if (!itemObj && !item.isNull()) { - qmlInfo(this) << "mapToItem() given argument \"" << item.toQString() + qmlInfo(this) << "mapToItem() given argument \"" << item.toQStringNoThrow() << "\" which is neither null nor an Item"; return; } |