Make sure class enums work dynamically

This includes making sure typed class enums get the right size.  This also
fixes other enums that were incorrectly tested as variants.

Change-Id: Ie330ceee91fe4192a11405a4e231f1750247cd5e
Reviewed-by: Michael Brasser <michael.brasser@live.com>
 

4 files changed, 22 insertions, 9 deletions

diff --git a/tests/auto/proxy_multiprocess/client/main.cpp b/tests/auto/proxy_multiprocess/client/main.cpp
index 5f11402..19ba46f 100644
--- a/tests/auto/proxy_multiprocess/client/main.cpp
+++ b/tests/auto/proxy_multiprocess/client/main.cpp
@@ -60,16 +60,18 @@ private Q_SLOTS:
             QCOMPARE(m_rep->subClass()->i(), initialI);
             QVERIFY(m_rep->tracks() != nullptr);
             QVERIFY(tracksSpy.count() || tracksSpy.wait());
-            QCOMPARE(m_rep->myEnum(), QVariant::fromValue(ParentClassReplica::bar));
-            QCOMPARE(m_rep->date(), QVariant::fromValue(Qt::SystemLocaleShortDate));
-            QCOMPARE(m_rep->nsEnum(), QVariant::fromValue(NS::Bravo));
+            QCOMPARE(m_rep->myEnum(), ParentClassReplica::bar);
+            QCOMPARE(m_rep->date(), Qt::SystemLocaleShortDate);
+            QCOMPARE(m_rep->nsEnum(), NS::Bravo);
+            QCOMPARE(m_rep->ns2Enum(), NS2::NamespaceEnum::Bravo);
             QCOMPARE(m_rep->variant(), QVariant::fromValue(42.0f));
         } else {
             QVERIFY(m_rep->subClass() == nullptr);
             QVERIFY(m_rep->tracks() == nullptr);
-            QCOMPARE(m_rep->myEnum(), QVariant::fromValue(ParentClassReplica::foo));
-            QCOMPARE(m_rep->date(), QVariant::fromValue(Qt::ISODate));
-            QCOMPARE(m_rep->nsEnum(), QVariant::fromValue(NS::Alpha));
+            QCOMPARE(m_rep->myEnum(), ParentClassReplica::foo);
+            QCOMPARE(m_rep->date(), Qt::ISODate);
+            QCOMPARE(m_rep->nsEnum(), NS::Alpha);
+            QCOMPARE(m_rep->ns2Enum(), NS2::NamespaceEnum::Alpha);
             QCOMPARE(m_rep->variant(), QVariant());
         }
 
@@ -97,9 +99,10 @@ private Q_SLOTS:
         QCOMPARE(m_rep->subClass()->myPOD(), updatedValue);
         QCOMPARE(m_rep->subClass()->i(), updatedI);
         QVERIFY(m_rep->tracks() != nullptr);
-        QCOMPARE(m_rep->myEnum(), QVariant::fromValue(ParentClassReplica::foobar));
-        QCOMPARE(m_rep->date(), QVariant::fromValue(Qt::SystemLocaleLongDate));
-        QCOMPARE(m_rep->nsEnum(), QVariant::fromValue(NS::Charlie));
+        QCOMPARE(m_rep->myEnum(), ParentClassReplica::foobar);
+        QCOMPARE(m_rep->date(), Qt::SystemLocaleLongDate);
+        QCOMPARE(m_rep->nsEnum(), NS::Charlie);
+        QCOMPARE(m_rep->ns2Enum(), NS2::NamespaceEnum::Charlie);
         QCOMPARE(m_rep->variant(), QVariant::fromValue(podValue));
         qDebug() << "Verified expected final states, cleaning up.";
     }
diff --git a/tests/auto/proxy_multiprocess/namespace.h b/tests/auto/proxy_multiprocess/namespace.h
index 0b370ba..2d06e67 100644
--- a/tests/auto/proxy_multiprocess/namespace.h
+++ b/tests/auto/proxy_multiprocess/namespace.h
@@ -7,3 +7,9 @@ namespace NS
     Q_ENUM_NS(NamespaceEnum)
 }
 
+namespace NS2
+{
+    Q_NAMESPACE
+    enum class NamespaceEnum : quint8 { Alpha=1, Bravo, Charlie };
+    Q_ENUM_NS(NamespaceEnum)
+}
diff --git a/tests/auto/proxy_multiprocess/server/main.cpp b/tests/auto/proxy_multiprocess/server/main.cpp
index 9e806b9..1cd005d 100644
--- a/tests/auto/proxy_multiprocess/server/main.cpp
+++ b/tests/auto/proxy_multiprocess/server/main.cpp
@@ -58,6 +58,7 @@ private Q_SLOTS:
             parent.setMyEnum(ParentClassSource::bar);
             parent.setDate(Qt::SystemLocaleShortDate);
             parent.setNsEnum(NS::Bravo);
+            parent.setNs2Enum(NS2::NamespaceEnum::Bravo);
             parent.setVariant(QVariant::fromValue(42.0f));
         }
 
@@ -86,6 +87,7 @@ private Q_SLOTS:
         parent.setMyEnum(ParentClassSource::foobar);
         parent.setDate(Qt::SystemLocaleLongDate);
         parent.setNsEnum(NS::Charlie);
+        parent.setNs2Enum(NS2::NamespaceEnum::Charlie);
         parent.setVariant(QVariant::fromValue(podValue));
         emit parent.enum2(ParentClassSource::foo, ParentClassSource::bar);
 
diff --git a/tests/auto/proxy_multiprocess/subclass.rep b/tests/auto/proxy_multiprocess/subclass.rep
index b1fe352..2538b88 100644
--- a/tests/auto/proxy_multiprocess/subclass.rep
+++ b/tests/auto/proxy_multiprocess/subclass.rep
@@ -3,6 +3,7 @@
 
 USE_ENUM(Qt::DateFormat)
 USE_ENUM(NS::NamespaceEnum)
+USE_ENUM(NS2::NamespaceEnum)
 
 POD MyPOD(int i, float f, QString s)
 POD VariantPOD(int i, int j)
@@ -21,6 +22,7 @@ class ParentClass
     PROP(QVariant variant)
     PROP(Qt::DateFormat date = Qt::ISODate)
     PROP(NS::NamespaceEnum nsEnum = NS::Alpha)
+    PROP(NS2::NamespaceEnum ns2Enum = NS2::NamespaceEnum::Alpha)
 
     SLOT(bool start())
     SLOT(bool quit())