summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-02 01:00:10 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-02 01:00:10 +0100
commit6cf3428a43c5744096db0c849aa975c4cb06bd31 (patch)
treef7961a992461793ea40781516903c5dd629fe1e5 /src/plugins/platforms/windows
parent529cb7217c0162c31ef6f309730e93612b9798d3 (diff)
parentb3e91b66b9175c1c3ff5f73f3ac231f74f9bf932 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/qwindowsmenu.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index 72f11d54b4..b89e1b66a3 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -350,6 +350,13 @@ void QWindowsMenuItem::setIsSeparator(bool isSeparator)
if (m_separator == isSeparator)
return;
m_separator = isSeparator;
+ if (m_parentMenu == nullptr)
+ return;
+ MENUITEMINFO menuItemInfo;
+ menuItemInfoInit(menuItemInfo);
+ menuItemInfo.fMask = MIIM_FTYPE;
+ menuItemInfo.fType = isSeparator ? MFT_SEPARATOR : MFT_STRING;
+ SetMenuItemInfo(parentMenuHandle(), m_id, FALSE, &menuItemInfo);
}
void QWindowsMenuItem::setCheckable(bool checkable)