Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp
index 0e613753ef..381b683359 100644
--- a/tests/manual/diaglib/qwindowdump.cpp
+++ b/tests/manual/diaglib/qwindowdump.cpp
@@ -73,7 +73,7 @@ if ((type & typeConstant) == typeConstant) \
 if (flags & flagConstant) \
     s << ' ' << #flagConstant;
 
-void formatWindowFlags(QTextStream &str, const Qt::WindowFlags flags)
+void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags)
 {
     str << showbase << hex << unsigned(flags) << dec << noshowbase;
     const Qt::WindowFlags windowType = flags & Qt::WindowType_Mask;
@@ -158,7 +158,7 @@ void formatWindow(QTextStream &str, const QWindow *w, FormatWindowOptions option
 }
 
 static void dumpWindowRecursion(QTextStream &str, const QWindow *w,
-                                FormatWindowOptions options = 0, int depth = 0)
+                                FormatWindowOptions options = {}, int depth = 0)
 {
     indentStream(str, 2 * depth);
     formatWindow(str, w, options);