diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:24:15 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:25:44 +0300 |
| commit | e26163d066a867ca8f630f7caffff207ef26b4a7 (patch) | |
| tree | c55678478e7bb344459d9bdf2528f4e321e9c4d0 /recipes-qt/qt5/qt3d_git.bb | |
| parent | 0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 (diff) | |
| parent | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff) | |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
89ac66b Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
f087aeb Revert "qtbase: Adjust target mkspec settings"
8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
7dc422d qtwayland: check also that the destination for private headers exists before installing them
84d647a qtwayland: improve manual header installation
3d60f9a qtwayland: workaround upstream bug: install missing headers manually
eb5d6da qtwayland: disable gold for all archs like in qtbase
e2707a0 qt5: upgrade to 5.12.3
0778424 qtbase: disable gold for all archs not just x86
4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
a4bf240 qtbase-native: add native libdir to search path
adf7f60 qt5: patch build paths from installed files
28d4bfd Upgrade to 5.12.2
5a32838 layer.conf: Add warrior to compatible release series
Conflicts:
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
Change-Id: Iec1b6e65f8dfbb73ab96d68a91ff6a5e7d93c7de
Diffstat (limited to 'recipes-qt/qt5/qt3d_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7f7e964d..03ec775b 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " |