Test unregistered local enums in QML methods and signal handlers.

Also make sure valueC and valueD are initialized.

Change-Id: I8ee78b7b779c37ca792300c7771ae9975f43d8bb
Reviewed-by: Chris Adams <christopher.adams@nokia.com>

1 files changed, 19 insertions, 1 deletions

diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 9d3bd1d01c..7b3265efb4 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -839,9 +839,11 @@ class MyEnum2Class : public QObject
 {
     Q_OBJECT
     Q_ENUMS(EnumB)
+    Q_ENUMS(EnumE)
 
 public:
-    MyEnum2Class() : valueA(MyEnum1Class::A_Invalid), valueB(B_Invalid) {}
+    MyEnum2Class() : valueA(MyEnum1Class::A_Invalid), valueB(B_Invalid), valueC(Qt::PlainText),
+                     valueD(Qt::ElideLeft), valueE(E_Invalid), valueE2(E_Invalid) {}
 
     enum EnumB
     {
@@ -852,27 +854,43 @@ public:
         B_37 = 37
     };
 
+    enum EnumE
+    {
+        E_Invalid = -1,
+
+        E_14 = 14,
+        E_76 = 76
+    };
+
     MyEnum1Class::EnumA getValueA() { return valueA; }
     EnumB getValueB() { return valueB; }
     Qt::TextFormat getValueC() { return valueC; }
     Qt::TextElideMode getValueD() { return valueD; }
+    EnumE getValueE() { return valueE; }
+    EnumE getValueE2() { return valueE2; }
 
     Q_INVOKABLE void setValueA(MyEnum1Class::EnumA v) { valueA = v; emit valueAChanged(v); }
     Q_INVOKABLE void setValueB(EnumB v) { valueB = v; emit valueBChanged(v); }
     Q_INVOKABLE void setValueC(Qt::TextFormat v) { valueC = v; emit valueCChanged(v); }     //registered
     Q_INVOKABLE void setValueD(Qt::TextElideMode v) { valueD = v; emit valueDChanged(v); }  //unregistered
+    Q_INVOKABLE void setValueE(EnumE v) { valueE = v; emit valueEChanged(v); }
+    Q_INVOKABLE void setValueE2(MyEnum2Class::EnumE v) { valueE2 = v; emit valueE2Changed(v); }
 
 signals:
     void valueAChanged(MyEnum1Class::EnumA newValue);
     void valueBChanged(MyEnum2Class::EnumB newValue);
     void valueCChanged(Qt::TextFormat newValue);
     void valueDChanged(Qt::TextElideMode newValue);
+    void valueEChanged(EnumE newValue);
+    void valueE2Changed(MyEnum2Class::EnumE newValue);
 
 private:
     MyEnum1Class::EnumA valueA;
     EnumB valueB;
     Qt::TextFormat valueC;
     Qt::TextElideMode valueD;
+    EnumE valueE;
+    EnumE valueE2;
 };
 
 class MyEnumDerivedClass : public MyEnum2Class