Some Qt6 porting

- QVector cannot be forward-declared anymore as it is a typedef in Qt 6.
- 64 bit sizes cause warnings in printf("%d")

Task-number: QTCREATORBUG-24098
Change-Id: I75fc2a1113fb7a6e8c298e985eb7eb8d1a4c21b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-07-09 11:44:26 +02:00
parent 5a64a0c5be
commit b9f47c5f02
7 changed files with 9 additions and 19 deletions

View File

@@ -1048,7 +1048,7 @@ void CdbEngine::runCommand(const DebuggerCommand &dbgCmd)
if (debug) {
qDebug("CdbEngine::postCommand %dms '%s' %s, pending=%d",
elapsedLogTime(), qPrintable(dbgCmd.function), qPrintable(stateName(state())),
m_commandForToken.size());
int(m_commandForToken.size()));
}
if (debug) {
qDebug("CdbEngine::postCommand: resulting command '%s'\n", qPrintable(fullCmd));
@@ -2104,7 +2104,7 @@ void CdbEngine::handleExtensionMessage(char t, int token, const QString &what, c
const DebuggerCommand command = m_commandForToken.take(token);
if (debug)
qDebug("### Completed extension command '%s' for token=%d, pending=%d",
qPrintable(command.function), token, m_commandForToken.size());
qPrintable(command.function), token, int(m_commandForToken.size()));
if (!command.callback) {
if (!message.isEmpty()) // log unhandled output
@@ -2294,7 +2294,7 @@ void CdbEngine::parseOutputLine(QString line)
if (debug)
qDebug("### Completed builtin command '%s' for token=%d, %d lines, pending=%d",
qPrintable(command.function), m_currentBuiltinResponseToken,
m_currentBuiltinResponse.count('\n'), m_commandForToken.size() - 1);
m_currentBuiltinResponse.count('\n'), int(m_commandForToken.size() - 1));
QTC_ASSERT(token == m_currentBuiltinResponseToken, return);
showMessage(m_currentBuiltinResponse, LogMisc);
if (command.callback) {

View File

@@ -26,10 +26,7 @@
#pragma once
#include <QMetaType>
QT_BEGIN_NAMESPACE
template <typename T> class QVector;
QT_END_NAMESPACE
#include <QVector>
namespace Valgrind {
namespace Callgrind {

View File

@@ -25,11 +25,10 @@
#pragma once
#include <QtGlobal>
#include <QVector>
QT_BEGIN_NAMESPACE
class QString;
template <typename T> class QVector;
class QStringList;
QT_END_NAMESPACE

View File

@@ -27,10 +27,7 @@
#pragma once
#include <QSharedDataPointer>
QT_BEGIN_NAMESPACE
template <typename T> class QVector;
QT_END_NAMESPACE
#include <QVector>
namespace Valgrind {
namespace XmlProtocol {

View File

@@ -28,10 +28,10 @@
#include <QMetaType>
#include <QSharedDataPointer>
#include <QVector>
QT_BEGIN_NAMESPACE
class QString;
template <typename T> class QVector;
QT_END_NAMESPACE
namespace Valgrind {

View File

@@ -27,10 +27,7 @@
#pragma once
#include <QSharedDataPointer>
QT_BEGIN_NAMESPACE
template <typename T> class QVector;
QT_END_NAMESPACE
#include <QVector>
namespace Valgrind {
namespace XmlProtocol {

View File

@@ -27,10 +27,10 @@
#pragma once
#include <QSharedDataPointer>
#include <QVector>
QT_BEGIN_NAMESPACE
class QString;
template <typename T> class QVector;
QT_END_NAMESPACE
namespace Valgrind {