1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes for GCC 11

Browse Source 
Task-number: QTBUG-89977
Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ville Voutilainen 2021-01-18 09:58:17 +02:00 committed by Sona Kurazyan
parent f8e07a5c41
commit 0518717d9c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/tools/qsharedpointer_impl.h
View File

@ -155,9 +155,6 @@ namespace QtSharedPointer {
#endif #endif
inline void checkQObjectShared(...) { } inline void checkQObjectShared(...) { }
inline void setQObjectShared(...) { } 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) // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -706,7 +706,7 @@ void QXcbWindow::show()
if (isTransient(window())) { if (isTransient(window())) {
const QWindow *tp = window()->transientParent(); const QWindow *tp = window()->transientParent();
if (tp && tp->handle()) 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 // Default to client leader if there is no transient parent, else modal dialogs can
// be hidden by their parents. // be hidden by their parents.
if (!transientXcbParent) if (!transientXcbParent)