-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
82 additions
and
5 deletions.
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,32 @@ | ||
From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 | ||
From: Nicolas Fella <nicolas.fella@kdab.com> | ||
Date: Sun, 20 Jun 2021 17:36:41 +0200 | ||
Subject: [PATCH] Add missing limits include | ||
|
||
The code uses std::numeric_limits but is lacking the appropriate include | ||
|
||
Pick-to: 5.15 6.1 6.2 | ||
Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd | ||
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | ||
|
||
[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] | ||
Signed-off-by: Peter Seiderer <ps.report@gmx.net> | ||
--- | ||
src/corelib/tools/qoffsetstringarray_p.h | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h | ||
index 4dd9e960..e26a57ff 100644 | ||
--- a/src/corelib/tools/qoffsetstringarray_p.h | ||
+++ b/src/corelib/tools/qoffsetstringarray_p.h | ||
@@ -55,6 +55,7 @@ | ||
|
||
#include <tuple> | ||
#include <array> | ||
+#include <limits> | ||
|
||
QT_BEGIN_NAMESPACE | ||
|
||
-- | ||
2.32.0 | ||
|
File renamed without changes.
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,38 @@ | ||
Description: include <limits> to fix some GCC 11 build issues | ||
Origin: upstream, commits: | ||
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 | ||
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 | ||
Last-Update: 2021-01-26 | ||
|
||
--- a/src/corelib/global/qendian.h | ||
+++ b/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> | ||
--- a/src/corelib/global/qfloat16.h | ||
+++ b/src/corelib/global/qfloat16.h | ||
@@ -43,6 +43,7 @@ | ||
|
||
#include <QtCore/qglobal.h> | ||
#include <QtCore/qmetatype.h> | ||
+#include <limits> | ||
#include <string.h> | ||
|
||
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) | ||
--- a/src/corelib/text/qbytearraymatcher.h | ||
+++ b/src/corelib/text/qbytearraymatcher.h | ||
@@ -42,6 +42,8 @@ | ||
|
||
#include <QtCore/qbytearray.h> | ||
|
||
+#include <limits> | ||
+ | ||
QT_BEGIN_NAMESPACE | ||
|
||
|