Merge remote-tracking branch 'qt/dev' into dev-highdpi

Conflicts:
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf

1 files changed, 3 insertions, 1 deletions

diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
index 2519533e32..16bb4f195c 100644
--- a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
@@ -124,7 +124,7 @@ public:
     quintptr tag()const Q_DECL_OVERRIDE { return m_tag; }
     void setTag(quintptr tag) Q_DECL_OVERRIDE;
 
-    const QString text() { return m_text; }
+    const QString text() const { return m_text; }
     void setText(const QString &text) Q_DECL_OVERRIDE;
     void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
     void setEnabled(bool enabled) Q_DECL_OVERRIDE;
@@ -150,6 +150,7 @@ public:
     const QList<QDBusPlatformMenuItem *> items() const;
 
     QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE;
+    QPlatformMenu *createSubMenu() const Q_DECL_OVERRIDE;
 
     bool operator==(const QDBusPlatformMenu& other) { return m_tag == other.m_tag; }
 
@@ -175,6 +176,7 @@ private:
     uint m_revision;
     QHash<quintptr, QDBusPlatformMenuItem *> m_itemsByTag;
     QList<QDBusPlatformMenuItem *> m_items;
+    QDBusPlatformMenuItem *m_containingMenuItem;
     static QList<QDBusPlatformMenu *> m_topLevelMenus;
 };