diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-01-18 09:58:17 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-01-19 22:33:38 +0200 |
| commit | 813a928c7c3cf98670b6043149880ed5c955efb9 (patch) | |
| tree | f8ea65a8cc828dab40d1579b0c6e514d2e756c15 | |
| parent | bd8d74e0e265297d61fe3b42f71a282bf381c379 (diff) | |
Build fixes for GCC 11
Task-number: QTBUG-89977
Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/text/qanystringview.h | 1 | ||||
| -rw-r--r-- | src/corelib/text/qbytearraymatcher.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index a760625344..ff1f8a4050 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -45,6 +45,7 @@ #ifdef __cpp_impl_three_way_comparison #include <compare> #endif +#include <limits> QT_BEGIN_NAMESPACE diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h index 876225230b..db6c06128c 100644 --- 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 diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 222aecb018..eb8846249b 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -152,9 +152,6 @@ namespace QtSharedPointer { #endif inline void checkQObjectShared(...) { } inline void setQObjectShared(...) { } - - inline void operator delete(void *ptr) { ::operator delete(ptr); } - inline void operator delete(void *, void *) { } }; // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 66f0558a55..9ee3040335 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -682,7 +682,7 @@ void QXcbWindow::show() if (isTransient(window())) { const QWindow *tp = window()->transientParent(); if (tp && tp->handle()) - transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId(); + transientXcbParent = tp->handle()->winId(); // Default to client leader if there is no transient parent, else modal dialogs can // be hidden by their parents. if (!transientXcbParent) |