Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 61816b6cc0..5a9d6d20eb 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -178,6 +178,8 @@ private slots:
     void intConversion_QTBUG43309();
     void toFixed();
 
+    void argumentEvaluationOrder();
+
 signals:
     void testSignal();
 };
@@ -3665,6 +3667,25 @@ void tst_QJSEngine::toFixed()
     QCOMPARE(result.toString(), QStringLiteral("12.1"));
 }
 
+void tst_QJSEngine::argumentEvaluationOrder()
+{
+    QJSEngine engine;
+    QJSValue ok = engine.evaluate(
+            "function record(arg1, arg2) {\n"
+            "    parameters = [arg1, arg2]\n"
+            "}\n"
+            "function test() {\n"
+            "    var i = 2;\n"
+            "    record(i, i += 2);\n"
+            "}\n"
+            "test()\n"
+            "parameters[0] == 2 && parameters[1] == 4");
+    qDebug() << ok.toString();
+    QVERIFY(ok.isBool());
+    QVERIFY(ok.toBool());
+
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"