From f7242cdce946693aafc030c673b17fda46dc3d01 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 23 Jun 2020 18:54:52 +0200
Subject: [PATCH] Debugger: Some compilation with Qt 6

Change-Id: Ifffe68a3c902bbad026919171ac906ae05ec86f2
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/cdb/cdbengine.cpp             |  4 ++--
 src/plugins/debugger/debuggerdialogs.cpp           | 10 +++++-----
 src/plugins/debugger/peripheralregisterhandler.cpp |  2 ++
 src/plugins/debugger/qml/qmlengine.cpp             |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 834a0cb94c1..472f8597d36 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -365,7 +365,7 @@ void CdbEngine::setupEngine()
                            "you will need to build a separate CDB extension with the "
                            "same bitness as the CDB you want to use.").
                 arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()),
-                    Core::Constants::IDE_DISPLAY_NAME));
+                    QString(Core::Constants::IDE_DISPLAY_NAME)));
         return;
     }
 
@@ -427,7 +427,7 @@ void CdbEngine::setupEngine()
     const QString msg = QString("Launching %1\nusing %2 of %3.")
                             .arg(debugger.toUserOutput(),
                                  QDir::toNativeSeparators(extensionFi.absoluteFilePath()),
-                                 extensionFi.lastModified().toString(Qt::SystemLocaleShortDate));
+                                 QLocale::system().toString(extensionFi.lastModified(), QLocale::ShortFormat));
     showMessage(msg, LogMisc);
 
     m_outputBuffer.clear();
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index afaaf6af56b..203dea6071f 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -580,7 +580,7 @@ void AttachToQmlPortDialog::setKitId(Id id)
 // --------- StartRemoteCdbDialog
 static QString cdbRemoteHelp()
 {
-    const char *cdbConnectionSyntax =
+    const char cdbConnectionSyntax[] =
             "Server:Port<br>"
             "tcp:server=Server,port=Port[,password=Password][,ipversion=6]\n"
             "tcp:clicon=Server,port=Port[,password=Password][,ipversion=6]\n"
@@ -599,10 +599,10 @@ static QString cdbRemoteHelp()
                 "Launch the remote CDB as <code>%5 &lt;executable&gt;</code> "
                 "to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>"
                 "<pre>%6</pre></body></html>")
-            .arg(Core::Constants::IDE_DISPLAY_NAME,
-                 ext32, ext64, "_NT_DEBUGGER_EXTENSION_PATH",
-                 "cdb.exe -server tcp:port=1234",
-                 QLatin1String(cdbConnectionSyntax));
+            .arg(QString(Core::Constants::IDE_DISPLAY_NAME),
+                 ext32, ext64, QString("_NT_DEBUGGER_EXTENSION_PATH"),
+                 QString("cdb.exe -server tcp:port=1234"),
+                 QString(cdbConnectionSyntax));
 }
 
 StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) :
diff --git a/src/plugins/debugger/peripheralregisterhandler.cpp b/src/plugins/debugger/peripheralregisterhandler.cpp
index beb5aa107b3..965495cf022 100644
--- a/src/plugins/debugger/peripheralregisterhandler.cpp
+++ b/src/plugins/debugger/peripheralregisterhandler.cpp
@@ -32,6 +32,8 @@
 #include <utils/basetreeview.h>
 #include <utils/savedaction.h>
 
+#include <QActionGroup>
+#include <QFile>
 #include <QItemDelegate>
 #include <QLineEdit>
 #include <QMenu>
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index e4faf22abd2..a94e3982639 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -1400,7 +1400,7 @@ void QmlEnginePrivate::setBreakpoint(const QString type, const QString target,
         QPacket rs(dataStreamVersion());
         rs <<  target.toUtf8() << enabled;
         engine->showMessage(QString("%1 %2 %3")
-                            .arg(BREAKONSIGNAL, target, QLatin1String(enabled ? "enabled" : "disabled")), LogInput);
+                            .arg(QString(BREAKONSIGNAL), target, QLatin1String(enabled ? "enabled" : "disabled")), LogInput);
         runDirectCommand(BREAKONSIGNAL, rs.data());
 
     } else {