diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
| commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
| tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
| parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 34349570..0536b6ad 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -22,8 +22,8 @@ require qt5-git.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared -# 5.13.meta-qt5-shared.1 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared +# 5.14.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -46,11 +46,11 @@ SRC_URI += "\ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native -# 5.13.meta-qt5-native.1 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native +# 5.14.meta-qt5-native.1 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ - file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |