Compile controls after changes in the meta system that broke it

Problem was that moc needs to have the full definition of the types,
it's not sufficient for it to have a fwd-declared type anymore.

Change-Id: Ie1f1402d53e4336cd4afd018f5ae4dbdc88118c6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

11 files changed, 26 insertions, 0 deletions

diff --git a/src/controls/Private/qquickcontrolsprivate_p.h b/src/controls/Private/qquickcontrolsprivate_p.h
index 4302f80a0..c4c41507c 100644
--- a/src/controls/Private/qquickcontrolsprivate_p.h
+++ b/src/controls/Private/qquickcontrolsprivate_p.h
@@ -53,6 +53,8 @@ class QQuickControlsPrivate1Attached : public QObject
     Q_OBJECT
     Q_PROPERTY(QQuickWindow* window READ window NOTIFY windowChanged)
 
+    Q_MOC_INCLUDE(<QtQuick/qquickwindow.h>)
+
 public:
     QQuickControlsPrivate1Attached(QObject* attachee);
 
diff --git a/src/controls/Private/qquicksceneposlistener_p.h b/src/controls/Private/qquicksceneposlistener_p.h
index 61447c7df..f2c1e9672 100644
--- a/src/controls/Private/qquicksceneposlistener_p.h
+++ b/src/controls/Private/qquicksceneposlistener_p.h
@@ -56,6 +56,8 @@ class QQuickScenePosListener1 : public QObject, public QQuickItemChangeListener
     Q_PROPERTY(QPointF scenePos READ scenePos NOTIFY scenePosChanged FINAL)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickScenePosListener1(QObject *parent = 0);
     ~QQuickScenePosListener1();
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h
index 97601a328..8d6757b51 100644
--- a/src/controls/qquickaction_p.h
+++ b/src/controls/qquickaction_p.h
@@ -69,6 +69,8 @@ class QQuickAction1 : public QObject
     Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
 #endif
 
+    Q_MOC_INCLUDE("qquickexclusivegroup_p.h")
+
 public:
     explicit QQuickAction1(QObject *parent = 0);
     ~QQuickAction1();
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index 0594f3919..762774a73 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -77,6 +77,9 @@ class QQuickMenu1 : public QQuickMenuText1
     Q_PROPERTY(bool __isProxy READ isProxy WRITE setProxy NOTIFY __proxyChanged)
     Q_ENUMS(MenuType)
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+    Q_MOC_INCLUDE("qquickaction_p.h")
+
 public:
     // MenuType must stay in sync with QPlatformMenu::MenuType
     enum MenuType { DefaultMenu = 0, EditMenu };
diff --git a/src/controls/qquickmenubar_p.h b/src/controls/qquickmenubar_p.h
index e6dc96470..d2e444350 100644
--- a/src/controls/qquickmenubar_p.h
+++ b/src/controls/qquickmenubar_p.h
@@ -61,6 +61,8 @@ class QQuickMenuBar1: public QObject
     Q_PROPERTY(QQuickWindow *__parentWindow READ parentWindow WRITE setParentWindow)
     Q_PROPERTY(bool __isNative READ isNative WRITE setNative NOTIFY nativeChanged)
 
+    Q_MOC_INCLUDE(<QtQuick/qquickwindow.h>)
+
 Q_SIGNALS:
     void menusChanged();
     void nativeChanged();
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index ae7ed0e6f..f28fafd99 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -81,6 +81,8 @@ class QQuickMenuBase1: public QObject
     Q_PROPERTY(bool __isNative READ isNative CONSTANT)
     Q_PROPERTY(QQuickItem *__visualItem READ visualItem WRITE setVisualItem)
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 Q_SIGNALS:
     void visibleChanged();
 
@@ -180,6 +182,9 @@ class QQuickMenuItem1 : public QQuickMenuText1
     Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
     Q_PROPERTY(QQuickAction1 *action READ boundAction WRITE setBoundAction NOTIFY actionChanged)
 
+    Q_MOC_INCLUDE("qquickexclusivegroup_p.h")
+    Q_MOC_INCLUDE("qquickaction_p.h")
+
 public Q_SLOTS:
     void trigger();
 
diff --git a/src/dialogs/qquickcolordialog_p.h b/src/dialogs/qquickcolordialog_p.h
index 619b7b100..2e252b399 100644
--- a/src/dialogs/qquickcolordialog_p.h
+++ b/src/dialogs/qquickcolordialog_p.h
@@ -61,6 +61,8 @@ class QQuickColorDialog : public QQuickAbstractColorDialog
     Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "contentItem")    // AbstractColorDialog in QML can have only one child
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickColorDialog(QObject *parent = 0);
     ~QQuickColorDialog();
diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h
index fec4ec9a1..53a8707b1 100644
--- a/src/dialogs/qquickdialog_p.h
+++ b/src/dialogs/qquickdialog_p.h
@@ -69,6 +69,8 @@ class QQuickDialog1 : public QQuickAbstractDialog
     Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "contentItem")    // Dialog in QML can have only one child
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickDialog1(QObject *parent = 0);
     ~QQuickDialog1();
diff --git a/src/dialogs/qquickfiledialog_p.h b/src/dialogs/qquickfiledialog_p.h
index ae608d752..0bf455928 100644
--- a/src/dialogs/qquickfiledialog_p.h
+++ b/src/dialogs/qquickfiledialog_p.h
@@ -61,6 +61,8 @@ class QQuickFileDialog : public QQuickAbstractFileDialog
     Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "contentItem")    // AbstractFileDialog in QML can have only one child
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickFileDialog(QObject *parent = 0);
     ~QQuickFileDialog();
diff --git a/src/dialogs/qquickfontdialog_p.h b/src/dialogs/qquickfontdialog_p.h
index bd04f5361..3c2089d60 100644
--- a/src/dialogs/qquickfontdialog_p.h
+++ b/src/dialogs/qquickfontdialog_p.h
@@ -61,6 +61,8 @@ class QQuickFontDialog : public QQuickAbstractFontDialog
     Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "contentItem")
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickFontDialog(QObject *parent = 0);
     ~QQuickFontDialog();
diff --git a/src/dialogs/qquickmessagedialog_p.h b/src/dialogs/qquickmessagedialog_p.h
index 3b79f9674..c4af85bea 100644
--- a/src/dialogs/qquickmessagedialog_p.h
+++ b/src/dialogs/qquickmessagedialog_p.h
@@ -61,6 +61,8 @@ class QQuickMessageDialog : public QQuickAbstractMessageDialog
     Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "contentItem")    // AbstractMessageDialog in QML can have only one child
 
+    Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
 public:
     explicit QQuickMessageDialog(QObject *parent = 0);
     ~QQuickMessageDialog();