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

Some Qt6 porting

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
src/plugins/valgrind/callgrind/callgrindfunctioncall.h
View File

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

3
src/plugins/valgrind/callgrind/callgrindparsedata.h
View File

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

5
src/plugins/valgrind/xmlprotocol/announcethread.h
View File

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

2
src/plugins/valgrind/xmlprotocol/error.h
View File

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

5
src/plugins/valgrind/xmlprotocol/stack.h
View File

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

2
src/plugins/valgrind/xmlprotocol/suppression.h
View File

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