Since 5.14 the qtdeclarative can be build with -no-opengl option so we
can remove the dependency. Now all 3D modules need to add the opengl
dependency by there own. We also must ensure that all 3D modules are
skipped if -no-opengl is specified.
The particles module depends on the opengl support and the module isn't
build if the support is missing. So we need a way to handle this too.
Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
rules/qt5.in | 7 ++++++-
rules/qt5.make | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rules/qt5.in b/rules/qt5.in
index 162ea8b9b..b5b6e2bfb 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -321,6 +321,7 @@ menu "Modules "
config QT5_MODULE_QT3D
bool
+ select QT5_OPENGL
select QT5_MODULE_QTDECLARATIVE
select QT5_MODULE_QTGRAPHICALEFFECTS
prompt "Qt3D"
@@ -379,6 +380,7 @@ endif
config QT5_MODULE_QTCANVAS3D
bool
+ select QT5_OPENGL
select QT5_MODULE_QTDECLARATIVE
prompt "QtCanvas3D"
@@ -418,7 +420,6 @@ config QT5_MODULE_QTDATAVIS3D_QUICK
config QT5_MODULE_QTDECLARATIVE
bool
- select QT5_OPENGL
prompt "QtDeclarative"
if QT5_MODULE_QTDECLARATIVE
@@ -445,6 +446,10 @@ config QT5_MODULE_QTDECLARATIVE_QUICK_DEBUG
bool
default QT5_MODULE_QTDECLARATIVE_DEBUG
+config QT5_MODULE_QTDECLARATIVE_QUICK_PARTICLES
+ bool
+ default QT5_OPENGL
+
endif
config QT5_MODULE_QTDECLARATIVE_ACCESSIBILITY
diff --git a/rules/qt5.make b/rules/qt5.make
index 63e8e29a9..e70fefe25 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -148,6 +148,7 @@ QT5_CONF_OPT := \
$(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \
$(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \
$(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \
+ $(call ptx/qt5-module, QT3D_QUICK, qtquick3d) \
$(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \
$(call ptx/qt5-module, QTQUICKCONTROLS2, qtquickcontrols2) \
$(call ptx/qt5-module, QTREMOTEOBJECTS, qtremoteobjects) \
@@ -445,7 +446,7 @@ QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK)
+= Qt5QmlWorkerScript
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) +=
Qt5QuickShapes
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK_WIDGETS) +=
Qt5QuickWidgets
-QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) +=
Qt5QuickParticles
+QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK_PARTICLES) +=
Qt5QuickParticles
ifdef PTXCONF_QT5_TEST
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QuickTest
endif
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
