diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
| commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
| tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
| parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
| download | meta-qt5-5.13.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 5f24877e..b88b83e2 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -17,8 +17,8 @@ require qt5-native.inc | |||
| 17 | require qt5-git.inc | 17 | require qt5-git.inc |
| 18 | 18 | ||
| 19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared |
| 21 | # 5.12.meta-qt5-shared.8 | 21 | # 5.13.meta-qt5-shared.1 |
| 22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
| 23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
| 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
| @@ -36,11 +36,12 @@ SRC_URI += "\ | |||
| 36 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 36 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
| 37 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ | 37 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ |
| 38 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 38 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
| 39 | file://0017-qfloat16-check-for-__ARM_FP-2.patch \ | ||
| 39 | " | 40 | " |
| 40 | 41 | ||
| 41 | # common for qtbase-native and nativesdk-qtbase | 42 | # common for qtbase-native and nativesdk-qtbase |
| 42 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native | 43 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native |
| 43 | # 5.12.meta-qt5-native.8 | 44 | # 5.13.meta-qt5-native.1 |
| 44 | SRC_URI += " \ | 45 | SRC_URI += " \ |
| 45 | file://0018-Always-build-uic-and-qvkgen.patch \ | 46 | file://0018-Always-build-uic-and-qvkgen.patch \ |
| 46 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ | 47 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ |