Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/qml/qv4assembler/tst_qv4assembler.cpp

Change-Id: I9d31c982881a617099354bf8acceb76332f11496

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 89c1d05905..fe2256319b 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -361,7 +361,7 @@ private:
             } \
             file.close(); \
         } else { \
-            QCOMPARE(expected, actual); \
+            QCOMPARE(actual, expected); \
         } \
     }
 
@@ -615,6 +615,9 @@ void tst_qqmllanguage::errors_data()
 
     QTest::newRow("assignComponentToWrongType") << "assignComponentToWrongType.qml" << "assignComponentToWrongType.errors.txt" << false;
     QTest::newRow("cyclicAlias") << "cyclicAlias.qml" << "cyclicAlias.errors.txt" << false;
+
+    QTest::newRow("fuzzed.1") << "fuzzed.1.qml" << "fuzzed.1.errors.txt" << false;
+    QTest::newRow("fuzzed.2") << "fuzzed.2.qml" << "fuzzed.2.errors.txt" << false;
 }
 
 
@@ -625,6 +628,7 @@ void tst_qqmllanguage::errors()
     QFETCH(bool, create);
 
     QQmlComponent component(&engine, testFileUrl(file));
+    QTRY_VERIFY(!component.isLoading());
 
     QScopedPointer<QObject> object;