Merge remote-tracking branch 'origin/dev' into HEAD

Conflicts:
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/compiler/qv4isel_moth_p.h
	src/qml/compiler/qv4ssa.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm_p.h
	src/qml/jit/qv4regalloc.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4qmlcontext_p.h
	src/qml/jsruntime/qv4regexp.cpp
	src/qml/jsruntime/qv4regexp_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	tests/auto/qml/qml.pro
	tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
	tools/qmlcachegen/qmlcachegen.cpp

Change-Id: I1577e195c736f3414089036b957a01cb91a3ca23

3 files changed, 38 insertions, 2 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index b301d4b975..d8af157b8e 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -104,6 +104,37 @@ static void annotateListElements(QmlIR::Document *document)
     }
 }
 
+static bool checkArgumentsObjectUseInSignalHandlers(const QmlIR::Document &doc, Error *error)
+{
+    for (QmlIR::Object *object: qAsConst(doc.objects)) {
+        for (auto binding = object->bindingsBegin(); binding != object->bindingsEnd(); ++binding) {
+            if (binding->type != QV4::CompiledData::Binding::Type_Script)
+                continue;
+            const QString propName =  doc.stringAt(binding->propertyNameIndex);
+            if (!propName.startsWith(QLatin1String("on"))
+                || propName.length() < 3
+                || !propName.at(2).isUpper())
+                continue;
+            auto compiledFunction = doc.jsModule.functions.value(object->runtimeFunctionIndices.at(binding->value.compiledScriptIndex));
+            if (!compiledFunction)
+                continue;
+            if (compiledFunction->usesArgumentsObject == QV4::Compiler::Context::ArgumentsObjectUsed) {
+                error->message = QLatin1Char(':') + QString::number(compiledFunction->line) + QLatin1Char(':');
+                if (compiledFunction->column > 0)
+                    error->message += QString::number(compiledFunction->column) + QLatin1Char(':');
+
+                error->message += QLatin1String(" error: The use of the arguments object in signal handlers is\n"
+                                                "not supported when compiling qml files ahead of time, because it may be ambiguous if\n"
+                                                "any signal parameter is called \"arguments\". Unfortunately we cannot distinguish\n"
+                                                "between it being a parameter or the JavaScript arguments object at this point.\n"
+                                                "Consider renaming the parameter of the signal if applicable.");
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
 static bool compileQmlFile(const QString &inputFileName, const QString &outputFileName, const QString &targetABI, Error *error)
 {
     QmlIR::Document irDocument(/*debugMode*/false);
@@ -167,6 +198,11 @@ static bool compileQmlFile(const QString &inputFileName, const QString &outputFi
             object->runtimeFunctionIndices.allocate(pool, runtimeFunctionIndices);
         }
 
+        if (!checkArgumentsObjectUseInSignalHandlers(irDocument, error)) {
+            *error = error->augment(inputFileName);
+            return false;
+        }
+
         QmlIR::QmlUnitGenerator generator;
         irDocument.javaScriptCompilationUnit = v4CodeGen.generateCompilationUnit(/*generate unit*/false);
         QV4::CompiledData::Unit *unit = generator.generate(irDocument);
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 9ab058d37b..d596613553 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -404,7 +404,7 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir)
     if (qmlDir.isEmpty())
         return ret;
 
-    QDirIterator iterator(qmlDir, QDir::AllDirs | QDir::NoDot | QDir::NoDotDot, QDirIterator::Subdirectories);
+    QDirIterator iterator(qmlDir, QDir::AllDirs | QDir::NoDotDot, QDirIterator::Subdirectories);
     QStringList blacklist;
 
     while (iterator.hasNext()) {
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 79f9b2c49b..422e37fd89 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -788,7 +788,7 @@ static bool readDependenciesData(QString dependenciesFile, const QByteArray &fil
                 QString version = obj.value(QStringLiteral("version")).toString();
                 if (name.isEmpty() || urisToSkip.contains(name) || version.isEmpty())
                     continue;
-                if (name.endsWith(QLatin1String("Private"), Qt::CaseInsensitive)) {
+                if (name.contains(QLatin1String("Private"), Qt::CaseInsensitive)) {
                     if (verbose)
                         std::cerr << "skipping private dependecy "
                                   << qPrintable( name ) << " "  << qPrintable(version) << std::endl;