From 483d5256c0a06e52430364d033db1f305bf167f8 Mon Sep 17 00:00:00 2001 From: Shrikant Dhumal Date: Wed, 9 Sep 2015 16:55:34 -0700 Subject: Added QT_NO_CONTEXTMENU check for contextMenuEvent() handler If Qt is configured with -no-feature-CONTEXTMENU it fails to compile qmleasing. Change-Id: I5ca001bbd0da5630fdfb54c5240e9bf4a5a81338 Reviewed-by: Jake Petroules --- tools/qmleasing/splineeditor.cpp | 2 ++ tools/qmleasing/splineeditor.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tools/qmleasing') diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp index b957cab4fe..56444f6b3b 100644 --- a/tools/qmleasing/splineeditor.cpp +++ b/tools/qmleasing/splineeditor.cpp @@ -228,6 +228,7 @@ void SplineEditor::mouseReleaseEvent(QMouseEvent *e) } } +#ifndef QT_NO_CONTEXTMENU void SplineEditor::contextMenuEvent(QContextMenuEvent *e) { int index = findControlPoint(e->pos()); @@ -247,6 +248,7 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e) addPoint(e->pos()); } } +#endif // QT_NO_CONTEXTMENU void SplineEditor::invalidate() { diff --git a/tools/qmleasing/splineeditor.h b/tools/qmleasing/splineeditor.h index 595580bba2..4b9da14a7a 100644 --- a/tools/qmleasing/splineeditor.h +++ b/tools/qmleasing/splineeditor.h @@ -84,7 +84,9 @@ protected: void mousePressEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *); +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *); +#endif // QT_NO_CONTEXTMENU void invalidate(); void invalidateSmoothList(); -- cgit v1.2.3