qtbase: Fix build with gcc-11

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-03-02 14:03:06 -08:00
committed by Martin Jansa
parent 2b33a5d5e8
commit 6214a1f3ff
4 changed files with 51 additions and 0 deletions

View File

@@ -43,6 +43,7 @@ SRC_URI += "\
file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
file://0020-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0021-qfloat16-Include-limits-header.patch \
"
# common for qtbase-native and nativesdk-qtbase

View File

@@ -38,6 +38,7 @@ SRC_URI += "\
file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
file://0020-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0021-qfloat16-Include-limits-header.patch \
"
# common for qtbase-native and nativesdk-qtbase

View File

@@ -0,0 +1,48 @@
From f680222892b44b3c1de129dc086613c6fe025c2d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 2 Mar 2021 13:18:47 -0800
Subject: [PATCH] qfloat16: Include <limits> header
gcc11 complains
error: 'numeric_limits' is not a class template
| 344 | template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)>
This is because its missing right header which perhaps is included
implicitly in older compilers
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/corelib/global/qfloat16.h | 1 +
1 file changed, 1 insertion(+)
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -44,6 +44,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qmetatype.h>
#include <string.h>
+#include <limits>
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
// All processors that support AVX2 do support F16C too. That doesn't mean
--- a/src/corelib/text/qbytearraymatcher.h
+++ b/src/corelib/text/qbytearraymatcher.h
@@ -40,6 +40,7 @@
#ifndef QBYTEARRAYMATCHER_H
#define QBYTEARRAYMATCHER_H
+#include <limits>
#include <QtCore/qbytearray.h>
QT_BEGIN_NAMESPACE
--- 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

View File

@@ -34,6 +34,7 @@ SRC_URI += "\
file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
file://0020-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0021-qfloat16-Include-limits-header.patch \
"
# Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with