Rename QQuickExclusiveGroup to QQuickExclusiveGroup1

This avoids clashes between Qt Quick Controls and Qt Labs Controls.
No other classes have this problem, as this is the only
class with the same name as that of one in Qt Labs Controls.

Change-Id: I6223e6b42654330abda7942dc5c7a2b3ad942b70
Task-number: QTBUG-48240
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index fe05c9c3..d8f3ca32 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -50,7 +50,7 @@ class QUrl;
 class QPlatformMenuItem;
 class QQuickItem;
 class QQuickAction;
-class QQuickExclusiveGroup;
+class QQuickExclusiveGroup1;
 class QQuickMenu;
 class QQuickMenuItemContainer;
 
@@ -173,7 +173,7 @@ class QQuickMenuItem : public QQuickMenuText
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(bool checkable READ checkable WRITE setCheckable NOTIFY checkableChanged)
     Q_PROPERTY(bool checked READ checked WRITE setChecked NOTIFY toggled)
-    Q_PROPERTY(QQuickExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
+    Q_PROPERTY(QQuickExclusiveGroup1 *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
     Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
     Q_PROPERTY(QQuickAction *action READ boundAction WRITE setBoundAction NOTIFY actionChanged)
 
@@ -213,8 +213,8 @@ public:
     bool checked() const;
     void setChecked(bool checked);
 
-    QQuickExclusiveGroup *exclusiveGroup() const;
-    void setExclusiveGroup(QQuickExclusiveGroup *);
+    QQuickExclusiveGroup1 *exclusiveGroup() const;
+    void setExclusiveGroup(QQuickExclusiveGroup1 *);
 
     void setParentMenu(QQuickMenu *parentMenu);