From 18d49808db46add078d9d4bcffaac5361d5c7269 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 27 Apr 2017 22:41:28 +0200 Subject: [PATCH] examples: fix compile without gui module With disabled gui module qmake in the directory examples/gui and examples/widgets failes with: Project ERROR: Could not find feature opengl. Fix this by protecting 'qtConfig(opengl)' by 'qtHaveModule(gui)' as already done in examples/examples.pro. Task-number: QTBUG-60488 Change-Id: Ia842124e818e8c81d41d2b8e3b8905bf1dee58ce Reviewed-by: Oswald Buddenhagen --- examples/gui/gui.pro | 2 +- examples/widgets/widgets.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index a4d960d3f51..b8080c20751 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -6,5 +6,5 @@ CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -qtConfig(opengl): \ +qtHaveModule(gui):qtConfig(opengl): \ SUBDIRS += openglwindow diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 513ddc91f2c..cef4936d324 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -22,7 +22,7 @@ SUBDIRS = \ tutorials \ widgets -qtConfig(opengl): \ +qtHaveModule(gui):qtConfig(opengl): \ SUBDIRS += windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows