diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-18 11:06:26 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-31 13:41:46 +0200 |
commit | 2401cc3106e6f6e1d9c2a3016110cfa914a13dab (patch) | |
tree | 91ff16b8128511bfe449f54977c4fb3f3511647d /recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch | |
parent | f3213460a0495cac618d37bcbe59fddd58b6d65d (diff) | |
parent | e0db5666f9c04c92683514ca220b0aafd0a49df2 (diff) | |
download | meta-qt5-2401cc3106e6f6e1d9c2a3016110cfa914a13dab.tar.gz |
Merge remote-tracking branch 'qtyocto/5.9' into 5.10
* qtyocto/5.9:
qt5: update version to 5.9.3
qt5: remove use of OE_QMAKE_WAYLAND_SCANNER
qtquickcontrols: remove duplicate FILES append
qtdeclarative: remove upstreamed patch
qt5: update qtx11extras revision for 5.9.2
qt5: update submodules
qt5: update submodules
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
qt5: add missing commercial license
Fix compiling for qtenginio and qtquick1
Use correct HostPrefix
qt5: update submodules
qtwebview: remove obsolete patch
qt5: update submodules
qtwebengine: add patch for long paths
qtwebengine: update 0004-Force-host-toolchain-configuration.patch
qtwebengine: fix build with glibc-2.26
qt: upgrade to latest revision in 5.9 branch
qt: refresh remaining patches and add links to meta-qt5 repos
qtwebengine: add a fix for building demobrowser without printing support
Upgrade to Qt 5.9.0
qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug
qtwebengine: disable SECURITY_STRINGFORMAT to fix the build
meta-toolchain-qt5: don't rely on COREBASE/LICENSE
qtbase: fix Krogoth build regression from efa8aaf
qt3d: refresh patches
qtwebengine: refresh patches
qtbase: refresh the patches
qtwebengine: update to 5.9.2
qt5: bump version number to 5.9.2
qtbase: fix Krogoth build regression from efa8aaf
gstreamer1.0-plugins-bad: add qt5 packageconfig
qtbase: remove qtbase-native from DEPENDS
qt3d: Fix build with clang
qtwebkit: Backport a patch to fix build with icu-59
quazip: update to 0.7.3 and add missing metadata
qtbase: Use sched_yield instead of pthread_yield
qtbase: Fix ptests with clang
qt5-ptest: fix build with yocto < 2.3 (pyro)
qtbase: add ptest
qwt-qt5.inc: fix QA warning
qt5-git.inc: set CVE_PRODUCT to qt
python-pyqt5: include QtWidgets module
qt5-creator: Link with libexecinfo on musl
qtvirtualkeyboard: Include sys/time.h
qtwebengine: Fix build on musl
qt5-creator: Fix build with NO_ACCESSIBILITY
maliit-framework-qt5: Always have optimize flags
qtbase-native: Fix qdbuscpp2xml segfault
qt5-ptest.inc: append do_populate_sysroot only for target
qtwebengine: fix build with gcc7
qwt-qt5: Fix rpath issues
qtquickcontrols2: fix compilation of examples/texteditor
qtquick1: add ptest
qtdeclarative: add ptest
qtxmlpatterns: add ptest
qt5: add qt5-ptest.inc
qtwebengine: add PACKAGECONFIG for webrtc
libconnman-qt5: update to 1.1.10
Revert "qttools: DEPENDS on icu"
qttools: DEPENDS on icu
qtbase: respect "ld-is-gold" DISTRO_FEATURES
Change-Id: I9dfcab3c94b62b22b68e66e8b13bdf4c570aada1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch new file mode 100644 index 00000000..a5fb1d84 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 4649f2a11fe4b87e9b79f50ff8ac99ba9a2344f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io> | ||
3 | Date: Wed, 25 Oct 2017 09:47:47 +0200 | ||
4 | Subject: [PATCH] Build accessibility tests only when Qt is configured with | ||
5 | accessibility | ||
6 | |||
7 | Original patch by Daniel Mack <daniel@zonque.org> | ||
8 | |||
9 | Task-number: QTBUG-64015 | ||
10 | Change-Id: I7dd0a1aa9bff08c6d19e818acf0e1b8b4b701f5b | ||
11 | Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> | ||
12 | --- | ||
13 | tests/auto/widgets/widgets.pro | 5 ++++- | ||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro | ||
17 | index 441eea0..7bab18f 100644 | ||
18 | --- a/tests/auto/widgets/widgets.pro | ||
19 | +++ b/tests/auto/widgets/widgets.pro | ||
20 | @@ -1,7 +1,6 @@ | ||
21 | TEMPLATE = subdirs | ||
22 | |||
23 | SUBDIRS += \ | ||
24 | - qwebengineaccessibility \ | ||
25 | qwebenginedefaultsurfaceformat \ | ||
26 | qwebenginedownloads \ | ||
27 | qwebenginefaviconmanager \ | ||
28 | @@ -14,6 +13,10 @@ SUBDIRS += \ | ||
29 | qwebenginesettings \ | ||
30 | qwebengineview | ||
31 | |||
32 | +qtConfig(accessibility) { | ||
33 | + SUBDIRS += qwebengineaccessibility | ||
34 | +} | ||
35 | + | ||
36 | contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile { | ||
37 | !contains(WEBENGINE_CONFIG, use_native_spellchecker) { | ||
38 | SUBDIRS += qwebenginespellcheck | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||