-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix compilation under gcc 13 (#1039)
* Update qt.mk add a patch to fix compilation on gcc 13 * add includes for std::runtime_error and uint8
- Loading branch information
1 parent
35a1473
commit 1a32c2b
Showing
4 changed files
with
37 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Fix compiling with GCC 11 | ||
|
||
See: https://bugreports.qt.io/browse/QTBUG-90395. | ||
|
||
Upstream commits: | ||
- Qt 5.15 -- unavailable as open source | ||
- Qt 6.0: b2af6332ea37e45ab230a7a5d2d278f86d961b83 | ||
- Qt 6.1: 9c56d4da2ff631a8c1c30475bd792f6c86bda53c | ||
|
||
--- old/qtbase/src/corelib/global/qendian.h | ||
+++ new/qtbase/src/corelib/global/qendian.h | ||
@@ -44,6 +44,8 @@ | ||
#include <QtCore/qfloat16.h> | ||
#include <QtCore/qglobal.h> | ||
|
||
+#include <limits> | ||
+ | ||
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems | ||
#include <stdlib.h> | ||
#include <string.h> | ||
|
||
--- old/qtbase/src/corelib/tools/qbytearraymatcher.h | ||
+++ new/qtbase/src/corelib/tools/qbytearraymatcher.h | ||
@@ -42,6 +42,8 @@ | ||
|
||
#include <QtCore/qbytearray.h> | ||
|
||
+#include <limits> | ||
+ | ||
QT_BEGIN_NAMESPACE | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters