diff options
| -rwxr-xr-x | tests/manual/v4/test262.py | 2 | ||||
| -rw-r--r-- | tests/manual/v4/tests.pro | 2 | ||||
| -rw-r--r-- | tools/qmljs/main.cpp (renamed from tools/v4/main.cpp) | 2 | ||||
| -rw-r--r-- | tools/qmljs/qmljs.pro (renamed from tools/v4/v4.pro) | 0 | ||||
| -rw-r--r-- | tools/tools.pro | 5 |
5 files changed, 6 insertions, 5 deletions
diff --git a/tests/manual/v4/test262.py b/tests/manual/v4/test262.py index 9f2ba80996..dbc6049a1a 100755 --- a/tests/manual/v4/test262.py +++ b/tests/manual/v4/test262.py @@ -153,7 +153,7 @@ EXCLUDE_LIST = [x.getAttribute("id") for x in EXCLUDE_LIST] def BuildOptions(): result = optparse.OptionParser() - result.add_option("--command", default="v4", help="The command-line to run") + result.add_option("--command", default="qmljs", help="The command-line to run") result.add_option("--tests", default=path.abspath(rootDir + '/test262'), help="Path to the tests") result.add_option("--cat", default=False, action="store_true", diff --git a/tests/manual/v4/tests.pro b/tests/manual/v4/tests.pro index 5a0a97dcd3..a86a6bf6af 100644 --- a/tests/manual/v4/tests.pro +++ b/tests/manual/v4/tests.pro @@ -1,7 +1,7 @@ TEMPLATE = aux TESTSCRIPT=$$PWD/test262.py -V4CMD = v4 +V4CMD = qmljs checktarget.target = check checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations diff --git a/tools/v4/main.cpp b/tools/qmljs/main.cpp index e6ab56b513..2d31dbfc0f 100644 --- a/tools/v4/main.cpp +++ b/tools/qmljs/main.cpp @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) } if (args.first() == QLatin1String("--help")) { - std::cerr << "Usage: v4 [|--debug|-d] [|--jit|--interpret|--compile|--aot|--llvm-jit] file..." << std::endl; + std::cerr << "Usage: qmljs [|--debug|-d] [|--jit|--interpret|--compile|--aot|--llvm-jit] file..." << std::endl; return EXIT_SUCCESS; } } diff --git a/tools/v4/v4.pro b/tools/qmljs/qmljs.pro index c67bb9caaf..c67bb9caaf 100644 --- a/tools/v4/v4.pro +++ b/tools/qmljs/qmljs.pro diff --git a/tools/tools.pro b/tools/tools.pro index 994a8c7114..217748915b 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -6,8 +6,7 @@ SUBDIRS += \ qmlprofiler !android|android_app: SUBDIRS += \ qml \ - qmlbundle \ - v4 + qmlbundle qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing # qmlmin & qmlbundle are build tools. @@ -21,6 +20,8 @@ qtNomakeTools( \ qmleasing \ ) +contains(QT_CONFIG, private_tests): SUBDIRS += qmljs + qtHaveModule(quick) { for(subdir, SUBDIRS): $${subdir}.depends += qmlimportscanner SUBDIRS += qmlimportscanner |