diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 10:40:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-08 10:40:54 +0100 |
| commit | a444a52ac8b6bf3368dd99653e33c7c947b8fe9b (patch) | |
| tree | 4e5140bef091fd1f0a5331b69855f3ff466818d1 | |
| parent | d022aa7a7645b60579764125061bcf7cebe04087 (diff) | |
| parent | 87a12f878dff91a2610e3aa1d87e762a1887640f (diff) | |
| download | qtscript-a444a52ac8b6bf3368dd99653e33c7c947b8fe9b.tar.gz | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
| -rw-r--r-- | examples/script/qscript/main.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/script/qscript/main.cpp b/examples/script/qscript/main.cpp index 0a6bd4d..189b1ad 100644 --- a/examples/script/qscript/main.cpp +++ b/examples/script/qscript/main.cpp @@ -119,7 +119,7 @@ static QScriptValue importExtension(QScriptContext *context, QScriptEngine *engi static QScriptValue loadScripts(QScriptContext *context, QScriptEngine *engine) { for (int i = 0; i < context->argumentCount(); ++i) { - QString fileName = context->argument(0).toString(); + QString fileName = context->argument(i).toString(); QFile file(fileName); if (!file.open(QIODevice::ReadOnly)) return context->throwError(QString::fromLatin1("could not open %0 for reading").arg(fileName)); diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index c64fa05..f381519 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,8 +9,6 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(Qt5_MODULE_TEST_DEPENDS Core) - test_module_includes( Script QScriptEngine ScriptTools QScriptEngineDebugger diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb..6a28b36 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,4 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs +CMAKE_QT_MODULES_UNDER_TEST = script + CONFIG += ctest_testcase |