3rdparty/ext_qt/0126-qtbase-Build-fixes-for-GCC-11.patch

0001 From 8bcf1828f4d75606fb8d6913dfe09e2363a06cac Mon Sep 17 00:00:00 2001
0002 From: Ville Voutilainen <ville.voutilainen@qt.io>
0003 Date: Mon, 18 Jan 2021 09:58:17 +0200
0004 Subject: [PATCH] Build fixes for GCC 11
0005
0006 Task-number: QTBUG-89977
0007 Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
0008 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
0009 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
0010 (cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
0011 ---
0012  src/corelib/tools/qbytearraymatcher.h    | 2 ++
0013  src/corelib/tools/qsharedpointer_impl.h  | 3 ---
0014  src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
0015  3 files changed, 3 insertions(+), 4 deletions(-)
0016
0017 diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
0018 index 0eedfc1d20..f5f9bef7b8 100644
0019 --- a/src/corelib/tools/qbytearraymatcher.h
0020 +++ b/src/corelib/tools/qbytearraymatcher.h
0021 @@ -42,6 +42,8 @@
0022
0023  #include <QtCore/qbytearray.h>
0024
0025 +#include <limits>
0026 +
0027  QT_BEGIN_NAMESPACE
0028
0029
0030 diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
0031 index 790c187cb9..4aee98af53 100644
0032 --- a/src/corelib/tools/qsharedpointer_impl.h
0033 +++ b/src/corelib/tools/qsharedpointer_impl.h
0034 @@ -155,9 +155,6 @@ namespace QtSharedPointer {
0035  #endif
0036          inline void checkQObjectShared(...) { }
0037          inline void setQObjectShared(...) { }
0038 -
0039 -        inline void operator delete(void *ptr) { ::operator delete(ptr); }
0040 -        inline void operator delete(void *, void *) { }
0041      };
0042      // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
0043
0044 diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
0045 index 9e7e1a5572..f0866a90ac 100644
0046 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp
0047 +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
0048 @@ -698,7 +698,7 @@ void QXcbWindow::show()
0049          if (isTransient(window())) {
0050              const QWindow *tp = window()->transientParent();
0051              if (tp && tp->handle())
0052 -                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
0053 +                transientXcbParent = tp->handle()->winId();
0054              // Default to client leader if there is no transient parent, else modal dialogs can
0055              // be hidden by their parents.
0056              if (!transientXcbParent)
0057 --
0058 GitLab
0059