From 856af42ec10769b0142e36b0c4782eec8a383ede Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Fri, 26 Oct 2018 16:24:57 +0200
Subject: [PATCH] moc on enums in namespaces before Qt 5.8 workaround fixed

---
 src/common/QskAspect.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h
index 548e71e1..3c7d3146 100644
--- a/src/common/QskAspect.h
+++ b/src/common/QskAspect.h
@@ -25,14 +25,15 @@
 
 #define QSK_NAMESPACE( name ) namespace name
 #define QSK_ENUM( name ) \
-    inline const QMetaObject *qt_getEnumMetaObject(name) noexcept { return qt_getQtMetaObject(); } \
+    inline const QMetaObject *qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \
     inline constexpr const char *qt_getEnumName(name) noexcept { return #name; }
 
-
 #endif
 
 QSK_NAMESPACE( QskAspect )
 {
+    extern const QMetaObject staticMetaObject;
+
     enum Subcontrol : quint16
     {
         Control        = 0,
@@ -116,8 +117,6 @@ QSK_NAMESPACE( QskAspect )
         AllStates        =   0xFFFF
     };
     QSK_ENUM( State )
-
-    extern const QMetaObject staticMetaObject;
 }
 
 QSK_DECLARE_OPERATORS_FOR_FLAGS( QskAspect::State )