diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmenu.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 4 |
2 files changed, 10 insertions, 1 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) diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 49bf5181cc..df458e85d7 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -583,7 +583,9 @@ QRect QXcbScreen::availableGeometry() const QImage::Format QXcbScreen::format() const { QImage::Format format; - qt_xcb_imageFormatForVisual(connection(), screen()->root_depth, visualForId(screen()->root_visual), &format); + bool needsRgbSwap; + qt_xcb_imageFormatForVisual(connection(), screen()->root_depth, visualForId(screen()->root_visual), &format, &needsRgbSwap); + // We are ignoring needsRgbSwap here and just assumes the backing-store will handle it. return format; } |