diff options
| author | Daniel Mack <daniel@zonque.org> | 2017-10-24 22:29:29 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-11-14 18:42:31 +0000 |
| commit | 06d1c47396508ea50112a00e1c70c40da559aa1a (patch) | |
| tree | 1178bafb98db219f0458bbe34b9323b069c8bb09 | |
| parent | d87335a50a9dd35d890786edbd79b8953fdaa11a (diff) | |
| download | meta-qt5-06d1c47396508ea50112a00e1c70c40da559aa1a.tar.gz | |
qtwebengine: make test suite succeed
Make the qtwebengine test suite succeed when Qt was built without
accessibility features.
Upstream bug report: https://bugreports.qt.io/browse/QTBUG-64015
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch | 37 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch b/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch new file mode 100644 index 00000000..8b82010c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 006f08373cbaa8485311f491ab8e67433c0e9ad6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Mack <daniel@zonque.org> | ||
| 3 | Date: Tue, 24 Oct 2017 15:46:19 +0200 | ||
| 4 | Subject: [PATCH] tests: make accessibility tests conditional | ||
| 5 | |||
| 6 | Only test the accessibility functions if accessibility was enabled in the Qt | ||
| 7 | config. | ||
| 8 | --- | ||
| 9 | tests/auto/widgets/widgets.pro | 5 ++++- | ||
| 10 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro | ||
| 13 | index 441eea0f..7bab18f0 100644 | ||
| 14 | --- a/tests/auto/widgets/widgets.pro | ||
| 15 | +++ b/tests/auto/widgets/widgets.pro | ||
| 16 | @@ -1,7 +1,6 @@ | ||
| 17 | TEMPLATE = subdirs | ||
| 18 | |||
| 19 | SUBDIRS += \ | ||
| 20 | - qwebengineaccessibility \ | ||
| 21 | qwebenginedefaultsurfaceformat \ | ||
| 22 | qwebenginedownloads \ | ||
| 23 | qwebenginefaviconmanager \ | ||
| 24 | @@ -14,6 +13,10 @@ SUBDIRS += \ | ||
| 25 | qwebenginesettings \ | ||
| 26 | qwebengineview | ||
| 27 | |||
| 28 | +qtConfig(accessibility) { | ||
| 29 | + SUBDIRS += qwebengineaccessibility | ||
| 30 | +} | ||
| 31 | + | ||
| 32 | contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile { | ||
| 33 | !contains(WEBENGINE_CONFIG, use_native_spellchecker) { | ||
| 34 | SUBDIRS += qwebenginespellcheck | ||
| 35 | -- | ||
| 36 | 2.13.6 | ||
| 37 | |||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 4ced7925..50a98b66 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -137,6 +137,7 @@ SRC_URI += " \ | |||
| 137 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 137 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
| 138 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ | 138 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ |
| 139 | file://0004-Force-host-toolchain-configuration.patch \ | 139 | file://0004-Force-host-toolchain-configuration.patch \ |
| 140 | file://0005-tests-make-accessibility-tests-conditional.patch \ | ||
| 140 | " | 141 | " |
| 141 | 142 | ||
| 142 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
