From 96c5b5ecf45759ecf0862e8f6af4f96b91ef5fe6 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Mon, 28 May 2012 09:31:00 +0900 Subject: [PATCH] Fix compilation for QT_NO_CONTEXTMENU in QtWidgets Change-Id: I05b23504549c0156ba5e72144674f843149932c0 Reviewed-by: Oswald Buddenhagen --- src/widgets/kernel/qwidgetwindow_qpa.cpp | 4 ++++ src/widgets/util/qsystemtrayicon_x11.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp index a127707..2e1e685 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa.cpp +++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp @@ -263,6 +263,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) if (m_widget->windowType() != Qt::Popup) qt_button_down = 0; qt_replay_popup_mouse_event = false; +#ifndef QT_NO_CONTEXTMENU } else if (event->type() == QEvent::MouseButtonPress && event->button() == Qt::RightButton && (openPopupCount == oldOpenPopupCount)) { @@ -273,6 +274,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) popupEvent = popupChild; QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); QApplication::sendSpontaneousEvent(popupEvent, &e); +#endif } if (releaseAfter) { @@ -310,10 +312,12 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) QApplicationPrivate::sendMouseEvent(receiver, &translated, widget, m_widget, &qt_button_down, qt_last_mouse_receiver); +#ifndef QT_NO_CONTEXTMENU if (event->type() == QEvent::MouseButtonPress && event->button() == Qt::RightButton) { QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); QGuiApplication::sendSpontaneousEvent(receiver, &e); } +#endif } void QWidgetWindow::handleTouchEvent(QTouchEvent *event) diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index e58d0d9..07ed255 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -213,8 +213,10 @@ QRect QSystemTrayIconSys::globalGeometry() const void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev) { QPoint globalPos = ev->globalPos(); +#ifndef QT_NO_CONTEXTMENU if (ev->button() == Qt::RightButton && q->contextMenu()) q->contextMenu()->popup(globalPos); +#endif if (QBalloonTip::isBalloonVisible()) { emit q->messageClicked(); -- 2.7.4