summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-05-03 12:24:15 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-05-03 12:25:44 +0300
commite26163d066a867ca8f630f7caffff207ef26b4a7 (patch)
treec55678478e7bb344459d9bdf2528f4e321e9c4d0 /recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
parent0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 (diff)
parent89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff)
downloadmeta-qt5-e26163d066a867ca8f630f7caffff207ef26b4a7.tar.gz
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/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index 7e5674be..420a1e3c 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From e5036f7002281cd122a9992da59270a25d9cff89 Mon Sep 17 00:00:00 2001 1From 7f912753d733d218eb87fd3b3d1d3d39e336f566 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index 64ed6b9ed8..bb2acbcd35 100644 18index 131aa868c2..294dfd6fd2 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -838,10 +838,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -843,10 +843,10 @@ defineTest(qtConfOutput_preparePaths) {
22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ 22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
23 "" \ 23 "" \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \