diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-05-12 21:30:10 +0200 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-05-17 14:08:30 +0000 |
commit | 4f6eb43898aa14fef5f3a54966b340188271d85e (patch) | |
tree | 1d5c02e14fe0cbbc4d8aa8d585bc4d3b0ef2008d /src/widgets/kernel/qwidgetwindow.cpp | |
parent | b7a7d61efc7319ed8ce111ba20d14403b1161ce8 (diff) |
QtCore: mark obsolete enumerations as deprecated
The following enumerations were obsolete for a log time but not marked
as deprecated:
- WA_NoBackground
- WA_MacNoClickThrough
- WA_MacBrushedMetal
- WA_MacMetalStyle
- WA_MSWindowsUseDirect3D
- WA_MacFrameworkScaled
- AA_MSWindowsUseDirect3DByDefault
- AA_X11InitThreads
- ImMicroFocus
mark them as deprecated and remove the usage inside QtBase so they can
be removed with Qt6
Change-Id: Ia087a7e1d0ff1945286895be6425a6cceaa483fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwidgetwindow.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 5bcf885dfe..70b305326c 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -222,10 +222,9 @@ static inline bool shouldBePropagatedToWidget(QEvent *event) } } -bool QWidgetWindowPrivate::allowClickThrough(const QPoint &globalPos) const +bool QWidgetWindowPrivate::allowClickThrough(const QPoint &) const { - QWidget *w = QApplication::widgetAt(globalPos); - return w && !w->testAttribute(Qt::WA_MacNoClickThrough); + return true; } bool QWidgetWindow::event(QEvent *event) @@ -1107,7 +1106,7 @@ void QWidgetWindow::handleContextMenuEvent(QContextMenuEvent *e) } } if (fw && fw->isEnabled()) { - QPoint pos = fw->inputMethodQuery(Qt::ImMicroFocus).toRect().center(); + QPoint pos = fw->inputMethodQuery(Qt::ImCursorRectangle).toRect().center(); QContextMenuEvent widgetEvent(QContextMenuEvent::Keyboard, pos, fw->mapToGlobal(pos), e->modifiers()); QGuiApplication::forwardEvent(fw, &widgetEvent, e); |