diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 09:53:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-09 11:43:35 +0100 |
| commit | 14f0efa0aea942b4483796d42e618366257f7a36 (patch) | |
| tree | b0a1ebfbb70c07bdb0041e48e2852f241724d439 /tests/auto/qml | |
| parent | 87e4279651cf691e82f266d61330f8daf4300da2 (diff) | |
| parent | e701690f79a7a0eecdb98d32c8f5130b67637256 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Diffstat (limited to 'tests/auto/qml')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 741fa9f04d..c43bd29614 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -3190,6 +3190,11 @@ void tst_QJSEngine::installTranslatorFunctions() QVERIFY(ret.isString()); QCOMPARE(ret.toString(), QString::fromLatin1("foo")); } + { + QJSValue ret = eng.evaluate("qsTr('%1').arg('foo')"); + QVERIFY(ret.isString()); + QCOMPARE(ret.toString(), QString::fromLatin1("foo")); + } QVERIFY(eng.evaluate("QT_TRID_NOOP()").isUndefined()); } |