summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qmenu.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-28 11:58:30 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-28 14:16:52 +0200
commit92a32e050fe0c545d0b7b70501c224d09f8d9ed6 (patch)
tree77cb0c2e73aae4de18ad6ddb79f1037d633b8ab7 /src/widgets/widgets/qmenu.cpp
parent7fe7bd326ff692067d7349153ad274a631762dff (diff)
Remove QMacNativeWidget and QMacCocoaViewContainer
The functionality should be available via QWidget::winId(), and QWidget::createWindowContainer() + QWindow::fromWinId(). Any bugs in this area should be fixed by improving the general wrapping APIs. Fixes: QTBUG-83254 Change-Id: I86584a4a8138d17d65a50da39efd58039f10da91 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
-rw-r--r--src/widgets/widgets/qmenu.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index e63a7edc4a..c2ef383d28 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -50,9 +50,6 @@
#include "qlayout.h"
#include "qpainter.h"
#include <qpa/qplatformtheme.h>
-#ifdef Q_OS_MACOS
-#include "qmacnativewidget_mac.h"
-#endif
#include "qapplication.h"
#ifndef QT_NO_ACCESSIBILITY
# include "qaccessible.h"
@@ -3592,8 +3589,8 @@ void QMenu::actionEvent(QActionEvent *e)
if (QWidget *widget = d->widgetItems.value(wa)) {
#ifdef Q_OS_MACOS
QWidget *p = widget->parentWidget();
- if (p != this && QT_IGNORE_DEPRECATIONS(qobject_cast<QMacNativeWidget *>(p))) {
- // This widget was reparented into a native Mac view
+ if (p != this) {
+ // This widget was reparented into a container widget
// (see QMenuPrivate::moveWidgetToPlatformItem).
// Reset the parent and delete the native widget.
widget->setParent(this);