1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the opengl module optionally depend on widgets

Browse Source 
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>
This commit is contained in:
Johan Klokkhammer Helsing 2020-01-14 09:28:27 +01:00
parent 123cf74dd0
commit 96dea48c15
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opengl/qopenglwidget.h
View File

@ -42,7 +42,7 @@
#include <QtOpenGL/qtopenglglobal.h> #include <QtOpenGL/qtopenglglobal.h>
#ifndef QT_NO_OPENGL #ifdef QT_WIDGETS_LIB
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QtGui/QSurfaceFormat> #include <QtGui/QSurfaceFormat>
@ -110,6 +110,6 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_OPENGL #endif // QT_WIDGETS_LIB
#endif // QOPENGLWIDGET_H #endif // QOPENGLWIDGET_H

13
src/src.pro
View File

@ -134,7 +134,7 @@ src_widgets.depends = src_corelib src_gui src_tools_uic src_platformheaders
src_opengl.subdir = $$PWD/opengl src_opengl.subdir = $$PWD/opengl
src_opengl.target = sub-opengl src_opengl.target = sub-opengl
src_opengl.depends = src_gui src_widgets src_opengl.depends = src_gui
src_openglextensions.subdir = $$PWD/openglextensions src_openglextensions.subdir = $$PWD/openglextensions
src_openglextensions.target = sub-openglextensions src_openglextensions.target = sub-openglextensions
@ -217,7 +217,11 @@ qtConfig(gui) {
TOOLS += src_tools_qvkgen TOOLS += src_tools_qvkgen
} }
SUBDIRS += src_gui src_platformsupport src_platformheaders SUBDIRS += src_gui src_platformsupport src_platformheaders
qtConfig(opengl): SUBDIRS += src_openglextensions qtConfig(opengl) {
SUBDIRS += src_openglextensions
SUBDIRS += src_opengl
src_plugins.depends += src_opengl
}
src_plugins.depends += src_gui src_platformsupport src_platformheaders src_plugins.depends += src_gui src_platformsupport src_platformheaders
src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers
qtConfig(widgets) { qtConfig(widgets) {
@ -225,14 +229,11 @@ qtConfig(gui) {
TOOLS += src_tools_uic TOOLS += src_tools_uic
src_plugins.depends += src_widgets src_plugins.depends += src_widgets
src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers
src_opengl.depends += src_widgets
qtConfig(printer) { qtConfig(printer) {
SUBDIRS += src_printsupport SUBDIRS += src_printsupport
src_plugins.depends += src_printsupport src_plugins.depends += src_printsupport
} }
qtConfig(opengl) {
SUBDIRS += src_opengl
src_plugins.depends += src_opengl
}
} }
} }
SUBDIRS += src_plugins SUBDIRS += src_plugins