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, 2 insertions, 2 deletions

diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h
index adcfc6bb..8ec6aa5c 100644
--- a/src/controls/qquickmenupopupwindow_p.h
+++ b/src/controls/qquickmenupopupwindow_p.h
@@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE
 class QQuickMenu1;
 class QQuickMenuBar1;
 
-class QQuickMenuPopupWindow : public QQuickPopupWindow
+class QQuickMenuPopupWindow1 : public QQuickPopupWindow1
 {
     Q_OBJECT
 public:
-    QQuickMenuPopupWindow(QQuickMenu1 *menu);
+    QQuickMenuPopupWindow1(QQuickMenu1 *menu);
 
     void setItemAt(QQuickItem *menuItem);
     void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow);