diff --git a/examples/script/qscript/main.cpp b/examples/script/qscript/main.cpp index 0a6bd4da762d87737f808afceed9f8c1fa016c51..189b1ad9b79f7927dc85eb21412efbb5670ceaab 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 c64fa05c4078374b0729a6a5d83e044c815b8893..f381519f56e1e732fa326a51e439d1b4ad4d6663 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 bf2dbcb772cc11f13d0cf09a3419c2a359962c17..6a28b366a7b9fcaa7e5781b8919b1c2c4ce4177a 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