diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-05 09:54:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-05 09:56:49 +0200 |
| commit | eed3ed9d9bab6ef81a822708b8e49710efa482f3 (patch) | |
| tree | eb9fd7b8311c05956e44df72925e27d8570ccaf1 | |
| parent | 415917d7b990c76a2763c9beb16599e312b2211f (diff) | |
| download | ptxdist-eed3ed9d9bab6ef81a822708b8e49710efa482f3.tar.gz ptxdist-eed3ed9d9bab6ef81a822708b8e49710efa482f3.tar.xz | |
qt5: QtWebEngine needs at least ARMv6
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/qt5.make | 7 | ||||
| -rw-r--r-- | rules/qt5examples.make | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/rules/qt5.make b/rules/qt5.make index 66fce1d39..1a8fee4c0 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -51,6 +51,13 @@ PTXCONF_QT5_MODULE_QTWEBKIT_EXAMPLES := PTXCONF_QT5_MODULE_QTWEBKIT_QUICK := PTXCONF_QT5_MODULE_QTWEBKIT_WIDGETS := endif +# QtWebEngine needs at least ARMv6 +ifdef PTXCONF_ARCH_ARM +ifndef PTXCONF_ARCH_ARM_V6 +PTXCONF_QT5_MODULE_QTWEBENGINE := +PTXCONF_QT5_MODULE_QTWEBENGINE_WIDGETS := +endif +endif # ---------------------------------------------------------------------------- # Prepare diff --git a/rules/qt5examples.make b/rules/qt5examples.make index 35d3b4e9f..bd9573c35 100644 --- a/rules/qt5examples.make +++ b/rules/qt5examples.make @@ -10,6 +10,12 @@ PTXCONF_QT5_MODULE_QTWEBENGINE := PTXCONF_QT5_MODULE_QTWEBKIT := PTXCONF_QT5_MODULE_QTWEBKIT_EXAMPLES := endif +# QtWebEngine needs at least ARMv6 +ifdef PTXCONF_ARCH_ARM +ifndef PTXCONF_ARCH_ARM_V6 +PTXCONF_QT5_MODULE_QTWEBENGINE := +endif +endif ifdef PTXCONF_QT5_EXAMPLES $(STATEDIR)/qt5.targetinstall.post: $(STATEDIR)/qt5.targetinstall2 |