summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-07-04 10:20:19 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-08-08 06:27:24 +0000
commit44538bd408cc7d82b858146b759024f5e38e64cc (patch)
tree380aeaab5e6f246501496f40fa2d1573bff80e85
parent94d666a06730b93f16a4bd9ad8d5509d974e146c (diff)
downloadmeta-qt5-44538bd408cc7d82b858146b759024f5e38e64cc.tar.gz
Upgrade to Qt 5.12.0
Change-Id: I83beaa146a88bf6138e11c87a3308db38d9afd34 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb3
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch8
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb3
-rw-r--r--recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch344
-rw-r--r--recipes-qt/qt5/qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb11
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb3
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb3
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb8
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
41 files changed, 58 insertions, 406 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 6c89c90c..1eecd42f 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -37,7 +37,6 @@ SRC_URI += "\
37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
40 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
41" 40"
42 41
43# common for qtbase-native and nativesdk-qtbase 42# common for qtbase-native and nativesdk-qtbase
@@ -208,4 +207,4 @@ fakeroot do_generate_qt_environment_file() {
208do_generate_qt_environment_file[umask] = "022" 207do_generate_qt_environment_file[umask] = "022"
209addtask generate_qt_environment_file after do_install before do_package 208addtask generate_qt_environment_file after do_install before do_package
210 209
211SRCREV = "9a04453b50ea22d6060aeb49250cf3e263d86ad3" 210SRCREV = "01e57909d4bce31483d023cf11dd2298391b38f3"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 88363219..1f871bb0 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From 15ba3204df65645f604a23f71f819a392ff1e4b7 Mon Sep 17 00:00:00 2001 1From da05164543625a93f3a646967d4692bcf13f441f Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -10,12 +10,12 @@ Subject: [PATCH] Allow a tools-only build
10 3 files changed, 8 insertions(+), 3 deletions(-) 10 3 files changed, 8 insertions(+), 3 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index 2cc347a1c..81cdeefb0 100644 13index 6f759b293..5f07c7c4e 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,4 +1,4 @@ 16@@ -1,4 +1,4 @@
17-requires(qtConfig(opengl)) 17-requires(qtConfig(opengl):!html5)
18+!tools-only:requires(qtConfig(opengl)) 18+!tools-only:requires(qtConfig(opengl):!html5)
19 19
20 CONFIG += examples_need_tools 20 CONFIG += examples_need_tools
21 load(qt_parts) 21 load(qt_parts)
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9dc57dd3..4d0d2024 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "9e20a1d578a44c6bdb98a9aacd7daf7aaf166e3e" 39SRCREV = "d4cc70fb26aef2612a32195afd3a88cf068cdbc6"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 7128301c..82639739 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.11" 5QT_MODULE_BRANCH ?= "dev"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.11.2+git${SRCPV}" 17PV = "5.12.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 215b42a9..1a98426c 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -32,7 +32,6 @@ SRC_URI += "\
32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
34 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 34 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
35 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
36" 35"
37 36
38# common for qtbase-native and nativesdk-qtbase 37# common for qtbase-native and nativesdk-qtbase
@@ -134,4 +133,4 @@ do_install() {
134 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 133 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
135} 134}
136 135
137SRCREV = "9a04453b50ea22d6060aeb49250cf3e263d86ad3" 136SRCREV = "01e57909d4bce31483d023cf11dd2298391b38f3"
diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
deleted file mode 100644
index fcfb4e9e..00000000
--- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
+++ /dev/null
@@ -1,344 +0,0 @@
1From 1f9aefc7b4dee2f64ae64b72f7a20b139feb8440 Mon Sep 17 00:00:00 2001
2From: Ulf Hermann <ulf.hermann@qt.io>
3Date: Fri, 27 Apr 2018 10:38:18 +0200
4Subject: [PATCH] Upgrade double-conversion to v3.0.0
5
6This fixes their issue #41, a potential undefined behavior.
7
8We preserve the locally added "__ghs" clause as well as the _M_ARM_FP
9clause necessary for winrt in utils.h.
10
11[ChangeLog][Third-Party Code] double-conversion got updated to upstream
12version 3.0.0.
13
14Task-number: QTBUG-66561
15Change-Id: Id79125bdeeaebb61dca2e2885d3370accce9030c
16Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
17Upstream-Status: Backport
18---
19 src/3rdparty/double-conversion/bignum.cc | 2 +-
20 src/3rdparty/double-conversion/bignum.h | 1 -
21 .../double-conversion/cached-powers.cc | 5 +--
22 src/3rdparty/double-conversion/diy-fp.h | 22 +++++------
23 .../double-conversion/double-conversion.cc | 21 ++++++----
24 src/3rdparty/double-conversion/fixed-dtoa.cc | 5 ++-
25 src/3rdparty/double-conversion/ieee.h | 2 +-
26 .../include/double-conversion/utils.h | 38 +++++++++++++------
27 .../double-conversion/qt_attribution.json | 4 +-
28 src/3rdparty/double-conversion/strtod.cc | 2 +-
29 10 files changed, 60 insertions(+), 42 deletions(-)
30
31diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc
32index 2743d67e8d..8892de8f2a 100644
33--- a/src/3rdparty/double-conversion/bignum.cc
34+++ b/src/3rdparty/double-conversion/bignum.cc
35@@ -104,7 +104,7 @@ void Bignum::AssignDecimalString(Vector<const char> value) {
36 const int kMaxUint64DecimalDigits = 19;
37 Zero();
38 int length = value.length();
39- int pos = 0;
40+ unsigned int pos = 0;
41 // Let's just say that each digit needs 4 bits.
42 while (length >= kMaxUint64DecimalDigits) {
43 uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
44diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h
45index 5ec3544f57..c385f2237b 100644
46--- a/src/3rdparty/double-conversion/bignum.h
47+++ b/src/3rdparty/double-conversion/bignum.h
48@@ -49,7 +49,6 @@ class Bignum {
49
50 void AssignPowerUInt16(uint16_t base, int exponent);
51
52- void AddUInt16(uint16_t operand);
53 void AddUInt64(uint64_t operand);
54 void AddBignum(const Bignum& other);
55 // Precondition: this >= other.
56diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc
57index 9536f26927..2b43f06412 100644
58--- a/src/3rdparty/double-conversion/cached-powers.cc
59+++ b/src/3rdparty/double-conversion/cached-powers.cc
60@@ -131,7 +131,6 @@ static const CachedPower kCachedPowers[] = {
61 {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
62 };
63
64-static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers);
65 static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent.
66 static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10)
67 // Difference between the decimal exponents in the table above.
68@@ -144,14 +143,12 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
69 int max_exponent,
70 DiyFp* power,
71 int* decimal_exponent) {
72- (void)max_exponent; // Silence unused parameter warning in release builds
73- (void)kCachedPowersLength; // Silence unused parameter warning in release builds
74 int kQ = DiyFp::kSignificandSize;
75 double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10);
76 int foo = kCachedPowersOffset;
77 int index =
78 (foo + static_cast<int>(k) - 1) / kDecimalExponentDistance + 1;
79- ASSERT(0 <= index && index < kCachedPowersLength);
80+ ASSERT(0 <= index && index < static_cast<int>(ARRAY_SIZE(kCachedPowers)));
81 CachedPower cached_power = kCachedPowers[index];
82 ASSERT(min_exponent <= cached_power.binary_exponent);
83 (void) max_exponent; // Mark variable as used.
84diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h
85index 9dcf8fbdba..2edf34674e 100644
86--- a/src/3rdparty/double-conversion/diy-fp.h
87+++ b/src/3rdparty/double-conversion/diy-fp.h
88@@ -42,7 +42,7 @@ class DiyFp {
89 static const int kSignificandSize = 64;
90
91 DiyFp() : f_(0), e_(0) {}
92- DiyFp(uint64_t f, int e) : f_(f), e_(e) {}
93+ DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {}
94
95 // this = this - other.
96 // The exponents of both numbers must be the same and the significand of this
97@@ -76,22 +76,22 @@ class DiyFp {
98
99 void Normalize() {
100 ASSERT(f_ != 0);
101- uint64_t f = f_;
102- int e = e_;
103+ uint64_t significand = f_;
104+ int exponent = e_;
105
106 // This method is mainly called for normalizing boundaries. In general
107 // boundaries need to be shifted by 10 bits. We thus optimize for this case.
108 const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000);
109- while ((f & k10MSBits) == 0) {
110- f <<= 10;
111- e -= 10;
112+ while ((significand & k10MSBits) == 0) {
113+ significand <<= 10;
114+ exponent -= 10;
115 }
116- while ((f & kUint64MSB) == 0) {
117- f <<= 1;
118- e--;
119+ while ((significand & kUint64MSB) == 0) {
120+ significand <<= 1;
121+ exponent--;
122 }
123- f_ = f;
124- e_ = e;
125+ f_ = significand;
126+ e_ = exponent;
127 }
128
129 static DiyFp Normalize(const DiyFp& a) {
130diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc
131index 909985be82..6f21a0124c 100644
132--- a/src/3rdparty/double-conversion/double-conversion.cc
133+++ b/src/3rdparty/double-conversion/double-conversion.cc
134@@ -118,7 +118,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
135 StringBuilder* result_builder) const {
136 // Create a representation that is padded with zeros if needed.
137 if (decimal_point <= 0) {
138- // "0.00000decimal_rep".
139+ // "0.00000decimal_rep" or "0.000decimal_rep00".
140 result_builder->AddCharacter('0');
141 if (digits_after_point > 0) {
142 result_builder->AddCharacter('.');
143@@ -129,7 +129,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
144 result_builder->AddPadding('0', remaining_digits);
145 }
146 } else if (decimal_point >= length) {
147- // "decimal_rep0000.00000" or "decimal_rep.0000"
148+ // "decimal_rep0000.00000" or "decimal_rep.0000".
149 result_builder->AddSubstring(decimal_digits, length);
150 result_builder->AddPadding('0', decimal_point - length);
151 if (digits_after_point > 0) {
152@@ -137,7 +137,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
153 result_builder->AddPadding('0', digits_after_point);
154 }
155 } else {
156- // "decima.l_rep000"
157+ // "decima.l_rep000".
158 ASSERT(digits_after_point > 0);
159 result_builder->AddSubstring(decimal_digits, decimal_point);
160 result_builder->AddCharacter('.');
161@@ -494,10 +494,17 @@ static double SignedZero(bool sign) {
162 // because it constant-propagated the radix and concluded that the last
163 // condition was always true. By moving it into a separate function the
164 // compiler wouldn't warn anymore.
165+#if _MSC_VER
166+#pragma optimize("",off)
167 static bool IsDecimalDigitForRadix(int c, int radix) {
168 return '0' <= c && c <= '9' && (c - '0') < radix;
169 }
170-
171+#pragma optimize("",on)
172+#else
173+static bool inline IsDecimalDigitForRadix(int c, int radix) {
174+ return '0' <= c && c <= '9' && (c - '0') < radix;
175+}
176+#endif
177 // Returns true if 'c' is a character digit that is valid for the given radix.
178 // The 'a_character' should be 'a' or 'A'.
179 //
180@@ -852,9 +859,9 @@ double StringToDoubleConverter::StringToIeee(
181 return junk_string_value_;
182 }
183 }
184- char sign = '+';
185+ char exponen_sign = '+';
186 if (*current == '+' || *current == '-') {
187- sign = static_cast<char>(*current);
188+ exponen_sign = static_cast<char>(*current);
189 ++current;
190 if (current == end) {
191 if (allow_trailing_junk) {
192@@ -888,7 +895,7 @@ double StringToDoubleConverter::StringToIeee(
193 ++current;
194 } while (current != end && *current >= '0' && *current <= '9');
195
196- exponent += (sign == '-' ? -num : num);
197+ exponent += (exponen_sign == '-' ? -num : num);
198 }
199
200 if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) {
201diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc
202index aef65fdc21..0f55a0b6eb 100644
203--- a/src/3rdparty/double-conversion/fixed-dtoa.cc
204+++ b/src/3rdparty/double-conversion/fixed-dtoa.cc
205@@ -98,7 +98,7 @@ class UInt128 {
206 return high_bits_ == 0 && low_bits_ == 0;
207 }
208
209- int BitAt(int position) {
210+ int BitAt(int position) const {
211 if (position >= 64) {
212 return static_cast<int>(high_bits_ >> (position - 64)) & 1;
213 } else {
214@@ -259,7 +259,8 @@ static void FillFractionals(uint64_t fractionals, int exponent,
215 fractionals -= static_cast<uint64_t>(digit) << point;
216 }
217 // If the first bit after the point is set we have to round up.
218- if (((fractionals >> (point - 1)) & 1) == 1) {
219+ ASSERT(fractionals == 0 || point - 1 >= 0);
220+ if ((fractionals != 0) && ((fractionals >> (point - 1)) & 1) == 1) {
221 RoundUp(buffer, length, decimal_point);
222 }
223 } else { // We need 128 bits.
224diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h
225index 661141d1a8..b14cf4f717 100644
226--- a/src/3rdparty/double-conversion/ieee.h
227+++ b/src/3rdparty/double-conversion/ieee.h
228@@ -99,7 +99,7 @@ class Double {
229 }
230
231 double PreviousDouble() const {
232- if (d64_ == (kInfinity | kSignMask)) return -Double::Infinity();
233+ if (d64_ == (kInfinity | kSignMask)) return -Infinity();
234 if (Sign() < 0) {
235 return Double(d64_ + 1).value();
236 } else {
237diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
238index 20bfd36c84..ca7646d817 100644
239--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
240+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
241@@ -33,19 +33,29 @@
242
243 #include <assert.h>
244 #ifndef ASSERT
245-# if defined(WINCE) || defined(_WIN32_WCE)
246-# define ASSERT(condition)
247-# else
248-# define ASSERT(condition) \
249+#define ASSERT(condition) \
250 assert(condition);
251-# endif
252 #endif
253 #ifndef UNIMPLEMENTED
254-# define UNIMPLEMENTED() (exit(-1))
255+#define UNIMPLEMENTED() (abort())
256+#endif
257+#ifndef DOUBLE_CONVERSION_NO_RETURN
258+#ifdef _MSC_VER
259+#define DOUBLE_CONVERSION_NO_RETURN __declspec(noreturn)
260+#else
261+#define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn))
262+#endif
263 #endif
264 #ifndef UNREACHABLE
265-# define UNREACHABLE() (exit(-1))
266+#ifdef _MSC_VER
267+void DOUBLE_CONVERSION_NO_RETURN abort_noreturn();
268+inline void abort_noreturn() { abort(); }
269+#define UNREACHABLE() (abort_noreturn())
270+#else
271+#define UNREACHABLE() (abort())
272 #endif
273+#endif
274+
275
276 // Double operations detection based on target architecture.
277 // Linux uses a 80bit wide floating point stack on x86. This induces double
278@@ -62,11 +72,15 @@
279 defined(__hppa__) || defined(__ia64__) || \
280 defined(__mips__) || \
281 defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
282+ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
283 defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
284 defined(__SH4__) || defined(__alpha__) || \
285 defined(_MIPS_ARCH_MIPS32R2) || \
286- defined(__AARCH64EL__)
287+ defined(__AARCH64EL__) || defined(__aarch64__) || \
288+ defined(__riscv)
289 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
290+#elif defined(__mc68000__)
291+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
292 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
293 #if defined(_WIN32)
294 // Windows uses a 64bit wide floating point stack.
295@@ -172,8 +186,8 @@ template <typename T>
296 class Vector {
297 public:
298 Vector() : start_(NULL), length_(0) {}
299- Vector(T* data, int length) : start_(data), length_(length) {
300- ASSERT(length == 0 || (length > 0 && data != NULL));
301+ Vector(T* data, int len) : start_(data), length_(len) {
302+ ASSERT(len == 0 || (len > 0 && data != NULL));
303 }
304
305 // Returns a vector using the same backing storage as this one,
306@@ -215,8 +229,8 @@ class Vector {
307 // buffer bounds on all operations in debug mode.
308 class StringBuilder {
309 public:
310- StringBuilder(char* buffer, int size)
311- : buffer_(buffer, size), position_(0) { }
312+ StringBuilder(char* buffer, int buffer_size)
313+ : buffer_(buffer, buffer_size), position_(0) { }
314
315 ~StringBuilder() { if (!is_finalized()) Finalize(); }
316
317diff --git a/src/3rdparty/double-conversion/qt_attribution.json b/src/3rdparty/double-conversion/qt_attribution.json
318index 92118ac779..d41a7ef332 100644
319--- a/src/3rdparty/double-conversion/qt_attribution.json
320+++ b/src/3rdparty/double-conversion/qt_attribution.json
321@@ -5,8 +5,8 @@
322 "QtUsage": "Used in Qt Core. Configure with -system-doubleconversion or -no-doubleconversion to avoid.",
323
324 "Homepage": "https://github.com/google/double-conversion",
325- "Version": "2.0.1",
326- "DownloadLocation": "https://github.com/google/double-conversion/commit/2fb03de56faa32bbba5e02222528e7b760f71d77",
327+ "Version": "3.0.0",
328+ "DownloadLocation": "https://github.com/google/double-conversion/commit/ca220cbafa83ca706f028bfbb5adc7eb2f1f90e1",
329 "License": "BSD 3-clause \"New\" or \"Revised\" License",
330 "LicenseId": "BSD-3-Clause",
331 "LicenseFile": "LICENSE",
332diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc
333index 34717562bd..17abcbb2a5 100644
334--- a/src/3rdparty/double-conversion/strtod.cc
335+++ b/src/3rdparty/double-conversion/strtod.cc
336@@ -286,7 +286,7 @@ static bool DiyFpStrtod(Vector<const char> buffer,
337 const int kDenominator = 1 << kDenominatorLog;
338 // Move the remaining decimals into the exponent.
339 exponent += remaining_decimals;
340- int error = (remaining_decimals == 0 ? 0 : kDenominator / 2);
341+ uint64_t error = (remaining_decimals == 0 ? 0 : kDenominator / 2);
342
343 int old_e = input.e();
344 input.Normalize();
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 40b5707a..77201cb5 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -28,7 +28,6 @@ SRC_URI += "\
28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
30 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 30 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
31 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
32" 31"
33 32
34# for syncqt 33# for syncqt
@@ -59,7 +58,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f
59# separate some parts of PACKAGECONFIG which are often changed 58# separate some parts of PACKAGECONFIG which are often changed
60PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 59PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
61PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 60PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
62PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" 61PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}"
63PACKAGECONFIG_FONTS ?= "" 62PACKAGECONFIG_FONTS ?= ""
64PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 63PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
65PACKAGECONFIG_DISTRO ?= "" 64PACKAGECONFIG_DISTRO ?= ""
@@ -127,7 +126,7 @@ PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds"
127PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" 126PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
128PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" 127PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
129PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" 128PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
130PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" 129PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb"
131PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 130PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
132PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 131PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
133PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 132PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -249,4 +248,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
249 248
250RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 249RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
251 250
252SRCREV = "9a04453b50ea22d6060aeb49250cf3e263d86ad3" 251SRCREV = "01e57909d4bce31483d023cf11dd2298391b38f3"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 9be6d3d6..9f41a020 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -1,13 +1,14 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 6 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 7 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ 8 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
9 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9" 10"
10 11
11DEPENDS = "qtdeclarative" 12DEPENDS = "qtdeclarative"
12 13
13SRCREV = "43f3a363133a93e2c6e465d149476a18f3a5d4e5" 14SRCREV = "d5565b5cee35570e185b34ca143158f79a27a3a5"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index d2ac5fa6..7c5dc9ac 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "85df7a646759b6504de463692e144016a47e183e" 11SRCREV = "cfde71c26792d595c2d948627b6c19ce0d7e9054"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 87d83767..5a67f041 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "150297f4884437ae22b03ed464313cd4d33088c1" 22SRCREV = "f1d00a83d12f27c37c20b6138f00ff82960018c1"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 1cd330d5..3940e661 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "4d2d9a85932e960e39396b375a7842756c8415fe" 11SRCREV = "eea291d2a53ed1e390baa9ed1ca59fb764b8b4ad"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 07cf5c06..c5bbf562 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,6 +33,6 @@ do_install_append_class-nativesdk() {
33 33
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "afccf3b4654c04c57d4f7e6da09f88e27ffb5a54" 36SRCREV = "7d183691a9ad95e1e1fafb611f83f42ba607bf5d"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index a021b72b..33a091fc 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "8f7dea835e63cd78648090fbc19ad7cb23ac642c" 17SRCREV = "5900b8d3c65082286f65bd93ba71a7acbf980336"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index ba1d3a79..ff6a6672 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "a67f916c317c9d9fa57f222a6dfe140b928935a7" 21SRCREV = "69dddc6190800b56b88f3322c231e67a5b86fdd0"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index c516a3e7..541768f3 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = " \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ 12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 15"
17 16
@@ -26,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 25
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 27
29SRCREV = "177c85c58db23aad28a7445956cab7f062caaa94" 28SRCREV = "6a039e4e77cef7d590c973c27c03a4576d6f5362"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index be6398d4..0c1deff3 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -31,7 +31,7 @@ SRC_URI += " \
31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
32" 32"
33 33
34SRCREV_qtlocation = "abcb5d1bccbc5913b7d994e0ad2685d484c35740" 34SRCREV_qtlocation = "cabf40ba4a897032b1e16b92147e1050c77f6fef"
35SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" 35SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e"
36 36
37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index cd7fcd10..a825635b 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "5488653cf82ad4ed94be4167a6281356b678928d" 40SRCREV = "4378984c44814c0b80bcf1acdabace54bcb2c8c9"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index a81b59d1..a7134bb6 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "f23445845310b9f47ea5592f1dea92ca463ba284" 12SRCREV = "093e7176cf9627db0ea1673ca329b722bd2397a7"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 1a865897..328eedec 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "54adaada25f2d8b44f9f15dc6e1b77e73f3cbdd3" 13SRCREV = "b474eb62c44c002e1b78bae97dde0bf77b735dce"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 979d1571..d41b3522 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "4e11d09fdef369af130c86a81df599ee3273ac7d" 13SRCREV = "f6e2de9d75ebd6c782fcb20e48375c9ac80d9d25"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 9d529145..a44f0f73 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "3b71eea2e6e712103452c98756cd6ce53aa4ebca" 20SRCREV = "07296992462dccf7e4512a829e9e1e5374f42764"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index e4e48d21..05c9c1a8 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "65b338416e5846c3d41f0286ad3020f4a5132e45" 27SRCREV = "4731d53f25a8cab7b7b99a90adf1ac922045639d"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 52128526..03711a65 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -32,4 +32,4 @@ DEPENDS += "qtbase"
32# http://errors.yoctoproject.org/Errors/Build/44915/ 32# http://errors.yoctoproject.org/Errors/Build/44915/
33LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 33LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
34 34
35SRCREV = "a951c3cf75fe1da3148b12f2aff2853b4d368909" 35SRCREV = "5f3e6f8a369839f51e65c65d65da45bd0f879358"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 212bead4..5d2e7006 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "cf06df0f8e0488be366aab2645fd5470992c8a4e" 13SRCREV = "b2dbb4ba78ca92e685307be94f28cf0bdb54171e"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11
16# 5.11.meta-qt5.4 16# 5.11.meta-qt5.4
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index d47efcb7..ca2f62e6 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "b2765e0922699afd654ef77e849148dba41384c0" 15SRCREV = "44c357ce531b06d7050ac9987c1ee8c1c470bd75"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 223886b7..ee60dfd1 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "9fe2ea2e0d8e696d7ba7d2dd03325007c2e415cc" 14SRCREV = "13d7ca49093a2b7d60ccee703c0d45542e4990de"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index aa899f18..4560334b 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase" 15DEPENDS += "qtbase"
16 16
17SRCREV = "ca6052a651b63b05a4deb6c85a2e627ab022264a" 17SRCREV = "25651536583ec4a138df2efb825b6a61969c4993"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 10794fa8..ab9a0c68 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 11"
13 12
14DEPENDS += "qtbase" 13DEPENDS += "qtbase"
15 14
16SRCREV = "59c8f354644b6016c6e0ac45e60d821544c6d4d2" 15SRCREV = "524478f60e6eac991b9ef033a2030a9ea5aa5c36"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 26b37907..50a797ba 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
33" 33"
34 34
35SRCREV = "ed6d2d42973b62271fd8de54db39ea8cf63e3d01" 35SRCREV = "92e96239dca854ef91508873325c0002e118c655"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
38 38
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 7b434e73..93da0fb4 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -103,4 +103,4 @@ FILES_${PN}-qthelp = " \
103 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 103 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
104" 104"
105 105
106SRCREV = "3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d" 106SRCREV = "e2ab66653d0c8ae59868ff5bc2a3a44d1b61cfd9"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 9146c79a..d45d1c58 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
49 49
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
51 51
52SRCREV = "0a93072035e7fc3fdc616674a18e1bb8e3dcdd89" 52SRCREV = "263a16009e8d08004a546954cd7b2671c26fab9e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 66ec9742..a729dcde 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "25a089b24844579f3623443182465f2d6f41da3a" 40SRCREV = "f4527f1581486b99d2699b2675ad5d258bc8a7fc"
41 41
42BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
43 43
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 50a55655..a00aff4a 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "ed82d154255b1bde0e44f0be174cee6e90173f86" 15SRCREV = "0880c04eec2653b94ac58f0e20a2215243fd1c66"
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
index 0b79599d..7cd441e6 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
@@ -1,4 +1,4 @@
1From 9e8b0fda6b2338feed486d238a61c2a51e4fd2b3 Mon Sep 17 00:00:00 2001 1From 2bf22a3bf04617f21497f80184bd038e11bc8b0d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 10 Jun 2018 10:26:17 +0000 3Date: Sun, 10 Jun 2018 10:26:17 +0000
4Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone 4Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone
@@ -36,15 +36,15 @@ Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
36 1 file changed, 1 insertion(+), 1 deletion(-) 36 1 file changed, 1 insertion(+), 1 deletion(-)
37 37
38diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp 38diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
39index 8f6687ff..994e2799 100644 39index f3b7d389..915d38fb 100644
40--- a/src/core/chromium_overrides.cpp 40--- a/src/core/chromium_overrides.cpp
41+++ b/src/core/chromium_overrides.cpp 41+++ b/src/core/chromium_overrides.cpp
42@@ -159,7 +159,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() 42@@ -134,7 +134,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking()
43 return std::move(font_list); 43 return std::move(font_list);
44 } 44 }
45 45
46-#if BUILDFLAG(ENABLE_PLUGINS) 46-#if QT_CONFIG(webengine_pepper_plugins)
47+#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE) 47+#if QT_CONFIG(webengine_pepper_plugins) && !defined(USE_OZONE)
48 // content/browser/renderer_host/pepper/pepper_truetype_font_list.h 48 // content/browser/renderer_host/pepper/pepper_truetype_font_list.h
49 void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families) 49 void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families)
50 { 50 {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
index b5c6c5de..2b30ef4e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -30,7 +30,7 @@ index bab07c5d2b..8f889aebc1 100644
30+ //please note ".$unique_name" is not used at the moment 30+ //please note ".$unique_name" is not used at the moment
31+ int pos = 0; 31+ int pos = 0;
32+ std::string delimiter("_"); 32+ std::string delimiter("_");
33+ while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos) 33+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
34+ rspfile = rspfile.substr(0,pos); 34+ rspfile = rspfile.substr(0,pos);
35+ 35+
36 if (!target_->sources().empty()) 36 if (!target_->sources().empty())
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b772f1b6..3dd5df19 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -3,7 +3,6 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt"
3# Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ 3# Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
4LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \
7 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ 6 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
8 file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \ 7 file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \
9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
@@ -26,6 +25,7 @@ DEPENDS += " \
26 libcap \ 25 libcap \
27 gperf-native \ 26 gperf-native \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
29" 29"
30 30
31DEPENDS_append_libc-musl = " libexecinfo" 31DEPENDS_append_libc-musl = " libexecinfo"
@@ -125,7 +125,7 @@ RDEPENDS_${PN}-examples += " \
125 qtdeclarative-qmlplugins \ 125 qtdeclarative-qmlplugins \
126" 126"
127 127
128QT_MODULE_BRANCH_CHROMIUM = "65-based" 128QT_MODULE_BRANCH_CHROMIUM = "67-based"
129 129
130# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 130# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11
131# 5.11.meta-qt5.6 131# 5.11.meta-qt5.6
@@ -164,8 +164,8 @@ SRC_URI_append_libc-musl = "\
164 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 164 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 165"
166 166
167SRCREV_qtwebengine = "d603b705539e1ec0d93761707d7df6d07bced98a" 167SRCREV_qtwebengine = "a5bdc6236ad52586579a9a3da6a059835ed60761"
168SRCREV_chromium = "c020786f57b8f5f3a450a8b77f850afe7c0d3f25" 168SRCREV_chromium = "d4ae420c54b0e8b4660b5c41ec0c38049115f9a9"
169SRCREV = "${SRCREV_qtwebengine}" 169SRCREV = "${SRCREV_qtwebengine}"
170 170
171SRCREV_FORMAT = "qtwebengine_chromium" 171SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 3160c5b1..49270f61 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "10f1effdc1c776c24b5314024aa3d04752dd2dfe" 21SRCREV = "90bb25e2132aded600cf68337f2390e3eb7d7a0d"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 2a63572c..e23980e3 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "2954e0112aac4d76aa8c78b3261de665621edbc6" 14SRCREV = "b8c8bb67342b83091a4066ba6f45e150330cb0ac"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 063b89a9..a95c64bb 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "1ac5e98a02f4467033c1159860b20e4b6a5d45c4" 22SRCREV = "4f37dfaa449049441c44d352f3c03e40f37cd645"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 5f417db6..b804c4ec 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "35645ce85bd0d48e8fd74b59898394e678ce1655" 15SRCREV = "5c483fe4fcad1e0474017856996067834cdee6b4"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 4cd02143..87eb4d8b 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase" 15DEPENDS += "qtbase"
16 16
17SRCREV = "3b5a20dc02bd00032a19c2951bfa940e6d83aca0" 17SRCREV = "e95c186fe8da96fba394490f9bca817534124b63"
18 18
19BBCLASSEXTEND =+ "native nativesdk" 19BBCLASSEXTEND =+ "native nativesdk"
20 20
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-05 15:53:56 +0000