diff options
author | Shrikant Dhumal <teck.shri@gmail.com> | 2015-09-03 20:07:27 -0700 |
---|---|---|
committer | Shrikant Dhumal <teck.shri@gmail.com> | 2015-09-09 07:33:58 +0000 |
commit | 924d4aefd5315c11d0637e2ba1a6b02246e89c44 (patch) | |
tree | 1d23be8b8b86955ec21130f847a0bc92b14d44fa /src/widgets/kernel/qwidgetwindow.cpp | |
parent | 933e3e886fe51cc1feb542615b4700294182cc47 (diff) |
Fixed build breaks that result after disabling "contextmenu" feature
Change-Id: I261f927ee720e0c65abd18417e1ac48dbee820df
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'src/widgets/kernel/qwidgetwindow.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 58436a7d92..f1e25d116d 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -283,7 +283,7 @@ bool QWidgetWindow::event(QEvent *event) case QEvent::ContextMenu: handleContextMenuEvent(static_cast<QContextMenuEvent *>(event)); return true; -#endif +#endif // QT_NO_CONTEXTMENU // Handing show events to widgets (see below) here would cause them to be triggered twice case QEvent::Show: @@ -510,8 +510,12 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) popupEvent = popupChild; QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); QApplication::sendSpontaneousEvent(popupEvent, &e); -#endif } +#else + Q_UNUSED(contextMenuTrigger) + Q_UNUSED(oldOpenPopupCount) + } +#endif if (releaseAfter) { qt_button_down = 0; |