diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-15 08:57:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-15 09:10:12 +0200 |
| commit | 9f3aefb086c5f9d6b9dd192689bdd473da07186a (patch) | |
| tree | 93349812f4a46305edf5e27f7e737d952e0d9a3a /tests/auto/qml/ecmascripttests | |
| parent | a021bd87755ccfbe49e132f942ded935c9719b00 (diff) | |
| parent | d2bb2e202427ebae545a408f065c893f3d837061 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9
Diffstat (limited to 'tests/auto/qml/ecmascripttests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp index 5d7009e7c8..880e254543 100644 --- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp +++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp @@ -44,7 +44,7 @@ void tst_EcmaScriptTests::runTests_data() QTest::addColumn<QString>("qmljsParameter"); QTest::newRow("jit") << QStringLiteral("--jit"); - // Not passing yet: QTest::newRow("interpreter") << QStringLiteral("--interpret"); + QTest::newRow("interpreter") << QStringLiteral("--interpret"); } void tst_EcmaScriptTests::runTests() |