Properly expose enums for introspection

qt/component.h

@@ -41,7 +41,6 @@ class ComponentData;
  */
 class APPSTREAMQT_EXPORT Component {
     Q_GADGET
-    Q_ENUMS(Kind UrlKind)
     public:
         enum Kind  {
             KindUnknown,
@@ -53,6 +52,8 @@ class APPSTREAMQT_EXPORT Component {
             KindAddon,
             KindFirmware
         };
+        Q_ENUM(Kind)
+
         enum UrlKind {
             UrlKindUnknown,
             UrlKindHomepage,
@@ -61,11 +62,14 @@ class APPSTREAMQT_EXPORT Component {
             UrlKindHelp,
             UrlKindDonation
         };
+        Q_ENUM(UrlKind)
+
         enum BundleKind {
             BundleKindUnknown,
             BundleKindLimba,
             BundleKindXdgApp
         };
+        Q_ENUM(BundleKind)
 
         Component();
         Component(const Component& other);

qt/image.h

@@ -43,13 +43,14 @@ class ImageData;
  */
 class APPSTREAMQT_EXPORT Image {
     Q_GADGET
-    Q_ENUMS(Kind)
     public:
         enum Kind {
             Unknown,
             Thumbnail,
             Plain
         };
+        Q_ENUM(Kind)
+
         Image();
         Image(const Image& other);
         ~Image();

qt/provides.h

@@ -32,7 +32,6 @@ class ProvidesData;
 
 class APPSTREAMQT_EXPORT Provides {
     Q_GADGET
-    Q_ENUMS(Kind)
     public:
         Provides();
         Provides(const Provides& other);
@@ -54,6 +53,7 @@ class APPSTREAMQT_EXPORT Provides {
             KindFirmwareRuntime,
             KindFirmwareFlashed
         };
+        Q_ENUM(Kind)
 
         void setKind(Kind kind);
         Kind kind() const;