Support unregistered Qt namespace enums in QML methods.

This brings the support in line with signal handlers, which should allow
us to reuse the implementation there when appropriate. Also adds tests
for both registered and unregisted Qt namespace enums.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 98f0335914..81e5f6b7c4 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -2293,6 +2293,7 @@ void tst_qqmllanguage::globalEnums()
 {
     qRegisterMetaType<MyEnum1Class::EnumA>();
     qRegisterMetaType<MyEnum2Class::EnumB>();
+    qRegisterMetaType<Qt::TextFormat>();
 
     QQmlComponent component(&engine, TEST_FILE("globalEnums.qml"));
 
@@ -2310,6 +2311,8 @@ void tst_qqmllanguage::globalEnums()
 
     QVERIFY(enum2Class->property("aValue") == 0);
     QVERIFY(enum2Class->property("bValue") == 0);
+    QVERIFY(enum2Class->property("cValue") == 0);
+    QVERIFY(enum2Class->property("dValue") == 0);
 
     QSignalSpy signalA(enum2Class, SIGNAL(valueAChanged(MyEnum1Class::EnumA)));
     QSignalSpy signalB(enum2Class, SIGNAL(valueBChanged(MyEnum2Class::EnumB)));
@@ -2319,12 +2322,16 @@ void tst_qqmllanguage::globalEnums()
     QVERIFY(enum1Class->getValue() == MyEnum1Class::A_13);
     QVERIFY(enum2Class->getValueA() == MyEnum1Class::A_11);
     QVERIFY(enum2Class->getValueB() == MyEnum2Class::B_37);
+    QVERIFY(enum2Class->getValueC() == Qt::RichText);
+    QVERIFY(enum2Class->getValueD() == Qt::ElideMiddle);
 
     QVERIFY(signalA.count() == 1);
     QVERIFY(signalB.count() == 1);
 
     QVERIFY(enum2Class->property("aValue") == MyEnum1Class::A_11);
     QVERIFY(enum2Class->property("bValue") == 37);
+    QVERIFY(enum2Class->property("cValue") == 1);
+    QVERIFY(enum2Class->property("dValue") == 2);
 
     delete o;
 }