diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2020-03-12 12:35:15 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-06-19 16:52:03 +0200 |
| commit | cb83037d89db53190f58358aae36fd050b384455 (patch) | |
| tree | fc06969c72111b1228bbbfa379490442d73093d8 /rules/qt5.in | |
| parent | 2032910173c11b2406fb5a882266487af2894314 (diff) | |
| download | ptxdist-cb83037d89db53190f58358aae36fd050b384455.tar.gz ptxdist-cb83037d89db53190f58358aae36fd050b384455.tar.xz | |
qt5: drop qtdeclarative opengl dependency
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.felsch@pengutronix.de>
Message-Id: <20200312113516.21154-2-m.felsch@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/qt5.in')
| -rw-r--r-- | rules/qt5.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/qt5.in b/rules/qt5.in index 5590b6237..4ba7e6837 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 |