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

 Conflicts:
	src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
	src/quick/handlers/qquickhandlerpoint.cpp
	src/quick/handlers/qquicksinglepointhandler.cpp
	tests/auto/qml/ecmascripttests/test262

Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index ca6e4c50b1..efd528860f 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -91,9 +91,10 @@ void Script::parse()
     Module module(v4->debugger() != nullptr);
 
     if (sourceCode.startsWith(QLatin1String("function("))) {
-        qWarning() << "Warning: Using function expressions as statements in scripts in not compliant with the ECMAScript specification at\n"
-                   << (sourceCode.leftRef(70) + QLatin1String("..."))
-                   << "\nThis will throw a  syntax error in Qt 5.12. If you want a function expression, surround it by parentheses.";
+        static const int snippetLength = 70;
+        qWarning() << "Warning: Using function expressions as statements in scripts is not compliant with the ECMAScript specification:\n"
+                   << (sourceCode.leftRef(snippetLength) + QLatin1String("..."))
+                   << "\nThis will throw a syntax error in Qt 5.12. If you want a function expression, surround it by parentheses.";
     }
 
     Engine ee, *engine = &ee;