diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-12-14 16:39:54 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-12-16 15:51:12 +0000 |
commit | 5ae76bbcf5b59b12a03d0f017aab9139609f16f6 (patch) | |
tree | 8fdd5068969a476fa482fe7d6f280e1d753918eb /recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch | |
parent | 06d1c47396508ea50112a00e1c70c40da559aa1a (diff) | |
download | meta-qt5-5ae76bbcf5b59b12a03d0f017aab9139609f16f6.tar.gz |
Upgrade to Qt 5.10.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index 8b82010c..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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 | |||