feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Some compilation with Qt 6

Browse Source 
Change-Id: Ifffe68a3c902bbad026919171ac906ae05ec86f2
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2020-06-23 18:54:52 +02:00
parent 5be581ddd0
commit f7242cdce9
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -365,7 +365,7 @@ void CdbEngine::setupEngine()
"you will need to build a separate CDB extension with the " "you will need to build a separate CDB extension with the "
"same bitness as the CDB you want to use."). "same bitness as the CDB you want to use.").
arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()), arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()),
Core::Constants::IDE_DISPLAY_NAME)); QString(Core::Constants::IDE_DISPLAY_NAME)));
return; return;
} }
@@ -427,7 +427,7 @@ void CdbEngine::setupEngine()
const QString msg = QString("Launching %1\nusing %2 of %3.") const QString msg = QString("Launching %1\nusing %2 of %3.")
.arg(debugger.toUserOutput(), .arg(debugger.toUserOutput(),
QDir::toNativeSeparators(extensionFi.absoluteFilePath()), QDir::toNativeSeparators(extensionFi.absoluteFilePath()),
extensionFi.lastModified().toString(Qt::SystemLocaleShortDate)); QLocale::system().toString(extensionFi.lastModified(), QLocale::ShortFormat));
showMessage(msg, LogMisc); showMessage(msg, LogMisc);
m_outputBuffer.clear(); m_outputBuffer.clear();

10
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -580,7 +580,7 @@ void AttachToQmlPortDialog::setKitId(Id id)
// --------- StartRemoteCdbDialog // --------- StartRemoteCdbDialog
static QString cdbRemoteHelp() static QString cdbRemoteHelp()
{ {
const char *cdbConnectionSyntax = const char cdbConnectionSyntax[] =
"Server:Port<br>" "Server:Port<br>"
"tcp:server=Server,port=Port[,password=Password][,ipversion=6]\n" "tcp:server=Server,port=Port[,password=Password][,ipversion=6]\n"
"tcp:clicon=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> " "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>" "to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>"
"<pre>%6</pre></body></html>") "<pre>%6</pre></body></html>")
.arg(Core::Constants::IDE_DISPLAY_NAME, .arg(QString(Core::Constants::IDE_DISPLAY_NAME),
ext32, ext64, "_NT_DEBUGGER_EXTENSION_PATH", ext32, ext64, QString("_NT_DEBUGGER_EXTENSION_PATH"),
"cdb.exe -server tcp:port=1234", QString("cdb.exe -server tcp:port=1234"),
QLatin1String(cdbConnectionSyntax)); QString(cdbConnectionSyntax));
} }
StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) :

2
src/plugins/debugger/peripheralregisterhandler.cpp
View File

@@ -32,6 +32,8 @@
#include <utils/basetreeview.h> #include <utils/basetreeview.h>
#include <utils/savedaction.h> #include <utils/savedaction.h>
#include <QActionGroup>
#include <QFile>
#include <QItemDelegate> #include <QItemDelegate>
#include <QLineEdit> #include <QLineEdit>
#include <QMenu> #include <QMenu>

2
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -1400,7 +1400,7 @@ void QmlEnginePrivate::setBreakpoint(const QString type, const QString target,
QPacket rs(dataStreamVersion()); QPacket rs(dataStreamVersion());
rs << target.toUtf8() << enabled; rs << target.toUtf8() << enabled;
engine->showMessage(QString("%1 %2 %3") 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()); runDirectCommand(BREAKONSIGNAL, rs.data());
} else { } else {