Controls: append "1" to all C++ classes

This is consistent with the classes that have already had this done.
It prevents clashes with Qt Quick Controls 2.
These classes are not available to the user, so it doesn't affect
compatibility.

Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/controls/qquickexclusivegroup_p.h b/src/controls/qquickexclusivegroup_p.h
index ee32a6f4b..cfff753d1 100644
--- a/src/controls/qquickexclusivegroup_p.h
+++ b/src/controls/qquickexclusivegroup_p.h
@@ -46,14 +46,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAction;
+class QQuickAction1;
 
 class QQuickExclusiveGroup1 : public QObject
 {
     Q_OBJECT
 
     Q_PROPERTY(QObject *current READ current WRITE setCurrent NOTIFY currentChanged)
-    Q_PROPERTY(QQmlListProperty<QQuickAction> __actions READ actions)
+    Q_PROPERTY(QQmlListProperty<QQuickAction1> __actions READ actions)
     Q_CLASSINFO("DefaultProperty", "__actions")
 
 public:
@@ -62,7 +62,7 @@ public:
     QObject *current() const { return m_current; }
     void setCurrent(QObject * o);
 
-    QQmlListProperty<QQuickAction> actions();
+    QQmlListProperty<QQuickAction1> actions();
 
 public Q_SLOTS:
     void bindCheckable(QObject *o);
@@ -75,7 +75,7 @@ private Q_SLOTS:
     void updateCurrent();
 
 private:
-    static void append_actions(QQmlListProperty<QQuickAction> *list, QQuickAction *action);
+    static void append_actions(QQmlListProperty<QQuickAction1> *list, QQuickAction1 *action);
 
     QObject * m_current;
     QMetaMethod m_updateCurrentMethod;