diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
| commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
| tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |
| parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
| parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
| download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
Diffstat (limited to 'recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch')
| -rw-r--r-- | recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index de1b645f..2f55a4b7 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 6bb830c68a7a530f0a18b9ceb4ef65eed0787fa5 Mon Sep 17 00:00:00 2001 | 1 | From 49be7a63b155004c612c7e9e0c671502ecba2c70 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
| 4 | Subject: [PATCH] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |