From 0518717d9caab95d17c03df133000d744cae5296 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Mon, 18 Jan 2021 09:58:17 +0200 Subject: [PATCH] Build fixes for GCC 11 Task-number: QTBUG-89977 Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 Reviewed-by: Lars Knoll Reviewed-by: Thiago Macieira (cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9) Reviewed-by: Marc Mutz --- src/corelib/tools/qsharedpointer_impl.h | 3 --- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index f05adf8fc51..d3d34aa3512 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -155,9 +155,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 2eff0e21648..21434d728e0 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -706,7 +706,7 @@ void QXcbWindow::show() if (isTransient(window())) { const QWindow *tp = window()->transientParent(); if (tp && tp->handle()) - transientXcbParent = static_cast(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)