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

Change-Id: Idde38761897f078cd9957f01d34a9751217e4c53

2 files changed, 11 insertions, 1 deletions

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()