From 924d4aefd5315c11d0637e2ba1a6b02246e89c44 Mon Sep 17 00:00:00 2001 From: Shrikant Dhumal Date: Thu, 3 Sep 2015 20:07:27 -0700 Subject: Fixed build breaks that result after disabling "contextmenu" feature Change-Id: I261f927ee720e0c65abd18417e1ac48dbee820df Reviewed-by: Jake Petroules --- examples/widgets/mainwindows/mainwindow/colorswatch.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/widgets/mainwindows/mainwindow/colorswatch.h') diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h index 8827a7dca7..251807d60f 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.h +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h @@ -51,7 +51,9 @@ public: QMenu *colorSwatchMenu() const { return menu; } protected: +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; +#endif // QT_NO_CONTEXTMENU void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; private slots: -- cgit v1.2.3