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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qlabel.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/qlabel.h | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 3182a0a3aa..45b601788f 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -229,7 +229,9 @@ protected: #ifndef QT_NO_WHEELEVENT void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; #endif +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; +#endif // QT_NO_CONTEXTMENU void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; void initStyleOption(QStyleOptionComboBox *option) const; diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 55e277026c..eeabd5db38 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -882,13 +882,11 @@ void QLabel::mouseReleaseEvent(QMouseEvent *ev) d->sendControlEvent(ev); } +#ifndef QT_NO_CONTEXTMENU /*!\reimp */ void QLabel::contextMenuEvent(QContextMenuEvent *ev) { -#ifdef QT_NO_CONTEXTMENU - Q_UNUSED(ev); -#else Q_D(QLabel); if (!d->isTextLabel) { ev->ignore(); @@ -902,8 +900,8 @@ void QLabel::contextMenuEvent(QContextMenuEvent *ev) ev->accept(); menu->setAttribute(Qt::WA_DeleteOnClose); menu->popup(ev->globalPos()); -#endif } +#endif // QT_NO_CONTEXTMENU /*! \reimp diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 1a3a68db60..6b6e15e0a8 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -132,7 +132,9 @@ protected: void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *ev) Q_DECL_OVERRIDE; +#endif // QT_NO_CONTEXTMENU void focusInEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 7439005b92..ba6db2971a 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -1060,6 +1060,8 @@ bool QTextEdit::event(QEvent *e) || e->type() == QEvent::ToolTip) { d->sendControlEvent(e); } +#else + Q_UNUSED(d) #endif // QT_NO_CONTEXTMENU #ifdef QT_KEYPAD_NAVIGATION if (e->type() == QEvent::EnterEditFocus || e->type() == QEvent::LeaveEditFocus) { |