aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/doc/src/javascript/hostenvironment.qdoc9
-rw-r--r--src/qml/parser/qqmljs.g4
-rw-r--r--src/qml/parser/qqmljsparser.cpp4
3 files changed, 0 insertions, 17 deletions
diff --git a/src/qml/doc/src/javascript/hostenvironment.qdoc b/src/qml/doc/src/javascript/hostenvironment.qdoc
index 3bd64ac115..a63ef617c0 100644
--- a/src/qml/doc/src/javascript/hostenvironment.qdoc
+++ b/src/qml/doc/src/javascript/hostenvironment.qdoc
@@ -166,15 +166,6 @@ Item {
}
\endqml
-\li The \c with statement is deprecated. Using the \c with statement will issue a warning
-at loading time and we plan on removing support for it in Qt 5.2. It is generally considered
-a language feature that is not recommended for use due reducing the readability of code and disabling
-many optimizations in the engine. It is also forbidden in ECMAScript 5 strict mode.
-
-\li JavaScript binding expressions are executed in non-strict mode. However we
-plan on changing the default for bindings in Qt 5.2 to execute always in
-ECMAScript 5 strict mode.
-
\endlist
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 8cc68e3643..de4fec4d56 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -2679,10 +2679,6 @@ case $rule_number: {
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
- if (lexer->qmlMode()) {
- const QString msg = qApp->translate("QQmlParser", "Deprecated JavaScript `with' statement detected in QML expression. Support for this will be removed in Qt 5.2!");
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, node->withToken, msg));
- }
} break;
./
diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp
index 75f0f743b8..b86b4a987f 100644
--- a/src/qml/parser/qqmljsparser.cpp
+++ b/src/qml/parser/qqmljsparser.cpp
@@ -1560,10 +1560,6 @@ case 317: {
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
- if (lexer->qmlMode()) {
- const QString msg = qApp->translate("QQmlParser", "Deprecated JavaScript `with' statement detected in QML expression. Support for this will be removed in Qt 5.2!");
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, node->withToken, msg));
- }
} break;
case 318: {