diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-04 16:00:36 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-10 19:46:48 +0000 |
| commit | 65299ce292180a845eb2d76756faeeaa1456d8f0 (patch) | |
| tree | e37332324436e64d57effea735b15bac7ee23fab /src/imports/testlib/main.cpp | |
| parent | 2ccd4c3672e5db2c25ca0f8df439fe8f646aa942 (diff) | |
Remove QQmlV4Handle
This is just an alias for QV4::ReturnedValue. We can as well use the
latter.
Change-Id: Ibd2c038a3ca726b39a8f0f05e02922adb9fccbdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/testlib/main.cpp')
| -rw-r--r-- | src/imports/testlib/main.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index c625c87db7..7b931c25d2 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -80,7 +80,7 @@ Q_SIGNALS: public Q_SLOTS: - QQmlV4Handle typeName(const QVariant& v) const + QJSValue typeName(const QVariant& v) const { QString name(v.typeName()); if (v.canConvert<QObject*>()) { @@ -97,27 +97,23 @@ public Q_SLOTS: QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = engine->handle(); - QV4::Scope scope(v4); - QV4::ScopedValue s(scope, v4->newString(name)); - return QQmlV4Handle(s); + return QJSValue(v4, v4->newString(name)->asReturnedValue()); } bool compare(const QVariant& act, const QVariant& exp) const { return act == exp; } - QQmlV4Handle callerFile(int frameIndex = 0) const + QJSValue callerFile(int frameIndex = 0) const { QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = engine->handle(); QV4::Scope scope(v4); QVector<QV4::StackFrame> stack = v4->stackTrace(frameIndex + 2); - if (stack.size() > frameIndex + 1) { - QV4::ScopedValue s(scope, v4->newString(stack.at(frameIndex + 1).source)); - return QQmlV4Handle(s); - } - return QQmlV4Handle(); + return (stack.size() > frameIndex + 1) + ? QJSValue(v4, v4->newString(stack.at(frameIndex + 1).source)->asReturnedValue()) + : QJSValue(); } int callerLine(int frameIndex = 0) const { |