From: Daniel Mack <daniel@zonque.org>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-qt5][PATCH resend] qtwebengine: make test suite succeed
Date: Tue, 24 Oct 2017 22:29:29 +0200 [thread overview]
Message-ID: <20171024202929.8249-1-daniel@zonque.org> (raw)
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>
---
...ests-make-accessibility-tests-conditional.patch | 37 ++++++++++++++++++++++
recipes-qt/qt5/qtwebengine_git.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
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 0000000..8b82010
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
@@ -0,0 +1,37 @@
+From 006f08373cbaa8485311f491ab8e67433c0e9ad6 Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel@zonque.org>
+Date: Tue, 24 Oct 2017 15:46:19 +0200
+Subject: [PATCH] tests: make accessibility tests conditional
+
+Only test the accessibility functions if accessibility was enabled in the Qt
+config.
+---
+ tests/auto/widgets/widgets.pro | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
+index 441eea0f..7bab18f0 100644
+--- a/tests/auto/widgets/widgets.pro
++++ b/tests/auto/widgets/widgets.pro
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+
+ SUBDIRS += \
+- qwebengineaccessibility \
+ qwebenginedefaultsurfaceformat \
+ qwebenginedownloads \
+ qwebenginefaviconmanager \
+@@ -14,6 +13,10 @@ SUBDIRS += \
+ qwebenginesettings \
+ qwebengineview
+
++qtConfig(accessibility) {
++ SUBDIRS += qwebengineaccessibility
++}
++
+ contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
+ !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
+ SUBDIRS += qwebenginespellcheck
+--
+2.13.6
+
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 4bc4cdb..519ccb4 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -138,6 +138,7 @@ SRC_URI += " \
file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
file://0003-Include-dependency-to-QCoreApplication-translate.patch \
file://0004-Force-host-toolchain-configuration.patch \
+ file://0005-tests-make-accessibility-tests-conditional.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
--
2.13.6
reply other threads:[~2017-10-24 20:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171024202929.8249-1-daniel@zonque.org \
--to=daniel@zonque.org \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox