From 1aecb24682075cbb99f21a367c399387b12257d0 Mon Sep 17 00:00:00 2001
From: Michael Brasser <mbrasser@ford.com>
Date: Tue, 22 May 2018 14:07:14 -0500
Subject: Ensure we restore QML-defined enums

This code path was previously missed, leading to some AOT-compiled types
generating errors of the form:

    Unable to assign [undefined] to int

[ChangeLog][QtQml] Fix QML declared enums with CONFIG+=qtquickcompiler.

Change-Id: Ib46a2b2505aa3863f091a6ccdebf8425e62fc38f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/qml/qmlcachegen/Enums.qml           |  9 +++++++++
 tests/auto/qml/qmlcachegen/qmlcachegen.pro     |  2 ++
 tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp | 11 +++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 tests/auto/qml/qmlcachegen/Enums.qml

(limited to 'tests')

diff --git a/tests/auto/qml/qmlcachegen/Enums.qml b/tests/auto/qml/qmlcachegen/Enums.qml
new file mode 100644
index 0000000000..830babb73e
--- /dev/null
+++ b/tests/auto/qml/qmlcachegen/Enums.qml
@@ -0,0 +1,9 @@
+import QtQml 2.0
+QtObject {
+    enum Test {
+        First = 100,
+        Second = 200
+    }
+    property int value: 0
+    Component.onCompleted: value = Enums.Second
+}
diff --git a/tests/auto/qml/qmlcachegen/qmlcachegen.pro b/tests/auto/qml/qmlcachegen/qmlcachegen.pro
index f62b950844..40de4548a7 100644
--- a/tests/auto/qml/qmlcachegen/qmlcachegen.pro
+++ b/tests/auto/qml/qmlcachegen/qmlcachegen.pro
@@ -14,4 +14,6 @@ RESOURCES += trickypaths.qrc
 
 RESOURCES += jsimport.qml script.js library.js
 
+RESOURCES += Enums.qml
+
 QT += core-private qml-private testlib
diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
index c95a5a5d25..3b7d268f7b 100644
--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
@@ -56,6 +56,8 @@ private slots:
     void trickyPaths();
 
     void scriptImport();
+
+    void enums();
 };
 
 // A wrapper around QQmlComponent to ensure the temporary reference counts
@@ -427,6 +429,15 @@ void tst_qmlcachegen::scriptImport()
     QTRY_COMPARE(obj->property("value").toInt(), 42);
 }
 
+void tst_qmlcachegen::enums()
+{
+    QQmlEngine engine;
+    CleanlyLoadingComponent component(&engine, QUrl("qrc:///Enums.qml"));
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(!obj.isNull());
+    QTRY_COMPARE(obj->property("value").toInt(), 200);
+}
+
 QTEST_GUILESS_MAIN(tst_qmlcachegen)
 
 #include "tst_qmlcachegen.moc"
-- 
cgit v1.2.3