Skip to content

Commit

Permalink
Build fixes for GCC 11
Browse files Browse the repository at this point in the history
Task-number: QTBUG-89977
Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  • Loading branch information
villevoutilainen committed Jan 19, 2021
1 parent bd8d74e commit 813a928
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/corelib/text/qanystringview.h
Expand Up @@ -45,6 +45,7 @@
#ifdef __cpp_impl_three_way_comparison
#include <compare>
#endif
#include <limits>

QT_BEGIN_NAMESPACE

Expand Down
2 changes: 2 additions & 0 deletions src/corelib/text/qbytearraymatcher.h
Expand Up @@ -42,6 +42,8 @@

#include <QtCore/qbytearray.h>

#include <limits>

QT_BEGIN_NAMESPACE


Expand Down
3 changes: 0 additions & 3 deletions src/corelib/tools/qsharedpointer_impl.h
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/platforms/xcb/qxcbwindow.cpp
Expand Up @@ -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)
Expand Down

0 comments on commit 813a928

Please sign in to comment.