1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide default implementation of QPlatformMenuBar::createMenu()

Browse Source 
Instead of falling back to createPlatformMenu() in client code.

Change-Id: Ia257449200f5c71f5e164072adce13d1137b1d87
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
This commit is contained in:
Tor Arne Vestbø 2017-01-05 14:13:31 +01:00
parent 2ac50ac156
commit 725c2346b1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qplatformmenu.cpp
View File

@ -55,4 +55,9 @@ QPlatformMenu *QPlatformMenu::createSubMenu() const
return QGuiApplicationPrivate::platformTheme()->createPlatformMenu();
}
QPlatformMenu *QPlatformMenuBar::createMenu() const
{
return QGuiApplicationPrivate::platformTheme()->createPlatformMenu();
}
QT_END_NAMESPACE

2
src/gui/kernel/qplatformmenu.h
View File

@ -150,7 +150,7 @@ public:
virtual void handleReparent(QWindow *newParentWindow) = 0;
virtual QPlatformMenu *menuForTag(quintptr tag) const = 0;
virtual QPlatformMenu *createMenu() const { return nullptr; }
virtual QPlatformMenu *createMenu() const;
};
QT_END_NAMESPACE

4
src/widgets/widgets/qmenubar.cpp
View File

@ -1192,10 +1192,6 @@ QPlatformMenu *QMenuBarPrivate::getPlatformMenu(QAction *action)
QPlatformMenu *platformMenu = action->menu()->platformMenu();
if (!platformMenu && platformMenuBar) {
platformMenu = platformMenuBar->createMenu();
// QPlatformMenuBar::createMenu() was introduced in Qt 5.7. Not all third party
// platform themes are using it, so fallback to QPlatformTheme::createPlatformMenu().
if (!platformMenu)
platformMenu = QGuiApplicationPrivate::platformTheme()->createPlatformMenu();
if (platformMenu)
action->menu()->setPlatformMenu(platformMenu);
}