Thanks, applied as cb83037d89db53190f58358aae36fd050b384455. Michael
[sent from post-receive hook] On Sat, 20 Jun 2020 00:04:11 +0200, Marco Felsch <[email protected]> wrote: > 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/qt5.in b/rules/qt5.in > index 5590b623792d..4ba7e6837c21 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" > @@ -408,7 +409,6 @@ config QT5_MODULE_QTDATAVIS3D_QUICK > > config QT5_MODULE_QTDECLARATIVE > bool > - select QT5_OPENGL > prompt "QtDeclarative" > > if QT5_MODULE_QTDECLARATIVE > @@ -435,6 +435,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 4f7ada8ad87d..aa9676af77ea 100644 > --- a/rules/qt5.make > +++ b/rules/qt5.make > @@ -453,7 +453,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 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
