Skip to content

Commit 26ce35f

Browse files
committed
build, qml: Fix compiling with GCC 11
1 parent a8dbc01 commit 26ce35f

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

depends/patches/qt/fix_limits_header.patch

+34
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ Upstream commits:
77
- Qt 6.0: b2af6332ea37e45ab230a7a5d2d278f86d961b83
88
- Qt 6.1: 9c56d4da2ff631a8c1c30475bd792f6c86bda53c
99

10+
Details of a patch for qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h:
11+
- upstream bug: not submitted
12+
- upstream commits:
13+
- Qt 5.15 -- unavailable as open source
14+
- Qt 6.1: 150bd8e33bc6f79906f711a74cf3fe6831bf05ac
15+
- Qt 6.2: 367293b18ab0d0a0432c1c8ce445fee052e5eee5
16+
17+
A patch for qtdeclarative/src/qml/jsruntime/qv4propertykey_p.h can be
18+
dropped after the commit 68b7a66a6e4d673d11aab44cb87b3f005cdff8ea
19+
in Qt 5.14.
20+
1021
--- old/qtbase/src/corelib/global/qendian.h
1122
+++ new/qtbase/src/corelib/global/qendian.h
1223
@@ -44,6 +44,8 @@
@@ -42,3 +53,26 @@ Upstream commits:
4253
#include <math.h>
4354
#include <stdio.h>
4455

56+
57+
--- old/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
58+
+++ old/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
59+
@@ -48,6 +48,7 @@
60+
#include <QtCore/qmetatype.h>
61+
62+
#include <initializer_list>
63+
+#include <limits>
64+
#include <type_traits>
65+
66+
//
67+
68+
--- old/qtdeclarative/src/qml/jsruntime/qv4propertykey_p.h
69+
+++ new/qtdeclarative/src/qml/jsruntime/qv4propertykey_p.h
70+
@@ -52,6 +52,8 @@
71+
72+
#include <private/qv4global_p.h>
73+
74+
+#include <limits>
75+
+
76+
QT_BEGIN_NAMESPACE
77+
78+
class QString

0 commit comments

Comments
 (0)