From 96dea48c154e5971593582f92917db3b3f17c7fa Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Tue, 14 Jan 2020 09:28:27 +0100
Subject: Make the opengl module optionally depend on widgets

Previously, it was a hard dependency, so the opengl module wouldn't get built
when configured with -no-feature-widgets even though the widget dependency is
only needed for QOpenGLWidget.

Task-number: QTBUG-74409
Change-Id: Icc6e7599d0c9c31e9448456eef1e5ecc4605234a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/opengl/qopenglwidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/opengl')

diff --git a/src/opengl/qopenglwidget.h b/src/opengl/qopenglwidget.h
index b331880b5d..b266dc359d 100644
--- a/src/opengl/qopenglwidget.h
+++ b/src/opengl/qopenglwidget.h
@@ -42,7 +42,7 @@
 
 #include <QtOpenGL/qtopenglglobal.h>
 
-#ifndef QT_NO_OPENGL
+#ifdef QT_WIDGETS_LIB
 
 #include <QtWidgets/QWidget>
 #include <QtGui/QSurfaceFormat>
@@ -110,6 +110,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_OPENGL
+#endif // QT_WIDGETS_LIB
 
 #endif // QOPENGLWIDGET_H
-- 
cgit v1.2.3