diff options
| -rw-r--r-- | examples/script/qscript/main.cpp | 2 | ||||
| -rw-r--r-- | sync.profile | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 2 |
4 files changed, 14 insertions, 5 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/sync.profile b/sync.profile index 8e890ef..914d962 100644 --- a/sync.profile +++ b/sync.profile @@ -11,6 +11,6 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/release", + "qtbase" => "refs/heads/old/5.0", ); diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index c64fa05..82dd5ef 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,9 +9,16 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(Qt5_MODULE_TEST_DEPENDS Core) +set(qt_module_includes + Script QScriptEngine +) + +if (NOT NO_WIDGETS) + list(APPEND qt_module_includes + ScriptTools QScriptEngineDebugger + ) +endif() test_module_includes( - Script QScriptEngine - ScriptTools QScriptEngineDebugger + ${qt_module_includes} ) 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 |