Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: Idde38761897f078cd9957f01d34a9751217e4c53

7 files changed, 41 insertions, 1 deletions

diff --git a/tests/auto/bic/README b/tests/auto/bic/README
new file mode 100644
index 0000000000..2bde3dd9b9
--- /dev/null
+++ b/tests/auto/bic/README
@@ -0,0 +1,13 @@
+This directory contains test data to be used by tst_bic to check that we don't
+introduce binary incompatible changes between releases. The bic test is run
+after every successful integration on Linux only. This data is generated after
+each minor release. The generated BC files contain virtual tables, and the bic
+test checks new content against the old data.
+
+See the following README for an explanation of how to generate this data:
+
+http://code.qt.io/cgit/qt/qtqa.git/tree/tests/postbuild/bic/README
+
+The test itself can be found here:
+
+http://code.qt.io/cgit/qt/qtqa.git/tree/tests/postbuild/bic
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index e15a05a00c..ec20714c51 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1670,7 +1670,8 @@ class SingletonWithEnum : public QObject
     Q_ENUMS(TestEnum)
 public:
     enum TestEnum {
-        TestValue = 42
+        TestValue = 42,
+        TestValue_MinusOne = -1
     };
 };
 
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 35f1534478..c662fdfb8b 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -7918,6 +7918,15 @@ void tst_qqmlecmascript::singletonWithEnum()
     QVariant prop = obj->property("testValue");
     QCOMPARE(prop.type(), QVariant::Int);
     QCOMPARE(prop.toInt(), int(SingletonWithEnum::TestValue));
+
+    {
+        QQmlExpression expr(qmlContext(obj.data()), obj.data(), "SingletonWithEnum.TestValue_MinusOne");
+        bool valueUndefined = false;
+        QVariant result = expr.evaluate(&valueUndefined);
+        QVERIFY2(!expr.hasError(), qPrintable(expr.error().toString()));
+        QVERIFY(!valueUndefined);
+        QCOMPARE(result.toInt(), -1);
+    }
 }
 
 void tst_qqmlecmascript::lazyBindingEvaluation()
diff --git a/tests/auto/qml/qqmllanguage/data/invalidAlias.13.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidAlias.13.errors.txt
new file mode 100644
index 0000000000..234753ad59
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/invalidAlias.13.errors.txt
@@ -0,0 +1 @@
+6:5:Invalid alias target
diff --git a/tests/auto/qml/qqmllanguage/data/invalidAlias.13.qml b/tests/auto/qml/qqmllanguage/data/invalidAlias.13.qml
new file mode 100644
index 0000000000..4050c0a7ad
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/invalidAlias.13.qml
@@ -0,0 +1,10 @@
+import QtQml 2.0
+
+QtObject {
+    property alias dataValue: dataVal
+
+    invalidAliasComponent {
+        id: dataVal
+        strValue: "value2"
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/data/invalidAliasComponent.qml b/tests/auto/qml/qqmllanguage/data/invalidAliasComponent.qml
new file mode 100644
index 0000000000..a45b1806a3
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/invalidAliasComponent.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+
+QtObject {
+    property string strValue: "value1"
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index dfc6509732..72e1a2915d 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -521,6 +521,7 @@ void tst_qqmllanguage::errors_data()
     QTest::newRow("invalidAlias.10") << "invalidAlias.10.qml" << "invalidAlias.10.errors.txt" << false;
     QTest::newRow("invalidAlias.11") << "invalidAlias.11.qml" << "invalidAlias.11.errors.txt" << false;
     QTest::newRow("invalidAlias.12") << "invalidAlias.12.qml" << "invalidAlias.12.errors.txt" << false;
+    QTest::newRow("invalidAlias.13") << "invalidAlias.13.qml" << "invalidAlias.13.errors.txt" << false;
 
     QTest::newRow("invalidAttachedProperty.1") << "invalidAttachedProperty.1.qml" << "invalidAttachedProperty.1.errors.txt" << false;
     QTest::newRow("invalidAttachedProperty.2") << "invalidAttachedProperty.2.qml" << "invalidAttachedProperty.2.errors.txt" << false;