Make platform menu tag/setTag not be pure virtual

Reasons:
 * Tag means nothing to the platform, tag is something
   the Qt side code will store and then restore, but it's meaningless
   for the platform, since it can be either the pointer to an
   action (qmenu.cpp) or an item count (qcombobox.cpp)
 * Since it's meaningless to the platform you don't know what
   to do when trying to implement a platform, this shows in how
   the field was being initialized, some initialized to this,
   some initialized to 0

On a followup commit we will remove the virtual tag but first
need to fix up other QPAs that don't live in the main repo

Change-Id: I15ac83f3bf7e4c741153d31ac761dbbe6f4b1b52
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 45 insertions, 4 deletions

diff --git a/src/gui/kernel/qplatformmenu.cpp b/src/gui/kernel/qplatformmenu.cpp
index 1eb146dd0f..0d76f2039d 100644
--- a/src/gui/kernel/qplatformmenu.cpp
+++ b/src/gui/kernel/qplatformmenu.cpp
@@ -45,6 +45,37 @@
 
 QT_BEGIN_NAMESPACE
 
+QPlatformMenuItem::QPlatformMenuItem()
+{
+    m_tag = reinterpret_cast<quintptr>(this);
+}
+
+void QPlatformMenuItem::setTag(quintptr tag)
+{
+    m_tag = tag;
+}
+
+quintptr QPlatformMenuItem::tag() const
+{
+    return m_tag;
+}
+
+QPlatformMenu::QPlatformMenu()
+{
+    m_tag = reinterpret_cast<quintptr>(this);
+}
+
+void QPlatformMenu::setTag(quintptr tag)
+{
+    m_tag = tag;
+}
+
+quintptr QPlatformMenu::tag() const
+{
+    return m_tag;
+
+}
+
 QPlatformMenuItem *QPlatformMenu::createMenuItem() const
 {
     return QGuiApplicationPrivate::platformTheme()->createPlatformMenuItem();
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h
index f8561445b1..e3fa5c71b1 100644
--- a/src/gui/kernel/qplatformmenu.h
+++ b/src/gui/kernel/qplatformmenu.h
@@ -62,6 +62,8 @@ class Q_GUI_EXPORT QPlatformMenuItem : public QObject
 {
 Q_OBJECT
 public:
+    QPlatformMenuItem();
+
     // copied from, and must stay in sync with, QAction menu roles.
     enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole,
                     AboutRole, PreferencesRole, QuitRole,
@@ -71,8 +73,8 @@ public:
                     RoleCount };
     Q_ENUM(MenuRole)
 
-    virtual void setTag(quintptr tag) = 0;
-    virtual quintptr tag()const = 0;
+    virtual void setTag(quintptr tag);
+    virtual quintptr tag() const;
 
     virtual void setText(const QString &text) = 0;
     virtual void setIcon(const QIcon &icon) = 0;
@@ -94,12 +96,17 @@ public:
 Q_SIGNALS:
     void activated();
     void hovered();
+
+private:
+    quintptr m_tag;
 };
 
 class Q_GUI_EXPORT QPlatformMenu : public QObject
 {
 Q_OBJECT
 public:
+    QPlatformMenu();
+
     enum MenuType { DefaultMenu = 0, EditMenu };
     Q_ENUM(MenuType)
 
@@ -108,8 +115,8 @@ public:
     virtual void syncMenuItem(QPlatformMenuItem *menuItem) = 0;
     virtual void syncSeparatorsCollapsible(bool enable) = 0;
 
-    virtual void setTag(quintptr tag) = 0;
-    virtual quintptr tag()const = 0;
+    virtual void setTag(quintptr tag);
+    virtual quintptr tag() const;
 
     virtual void setText(const QString &text) = 0;
     virtual void setIcon(const QIcon &icon) = 0;
@@ -138,6 +145,9 @@ public:
 Q_SIGNALS:
     void aboutToShow();
     void aboutToHide();
+
+private:
+    quintptr m_tag;
 };
 
 class Q_GUI_EXPORT QPlatformMenuBar : public QObject