Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

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));

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

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