ClangCodeModel, Puppet, CrashHandler: Compile with Qt6

Task-number: QTCREATORBUG-24098
Change-Id: Ic65e7a5dce0a512f48fb70915b9443ef7df2b787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-10-08 12:55:35 +02:00
parent 3ee70780b4
commit 41a51a63f5
5 changed files with 7 additions and 5 deletions

View File

@@ -26,8 +26,10 @@
#include "valueschangedcommand.h" #include "valueschangedcommand.h"
#include "sharedmemory.h" #include "sharedmemory.h"
#include <QCache> #include <QCache>
#include <QDebug> #include <QDebug>
#include <QIODevice>
#include <cstring> #include <cstring>

View File

@@ -469,7 +469,7 @@ bool CompleteCommand::run()
auto *processor = ClangEditorDocumentProcessor::get(documentFilePath); auto *processor = ClangEditorDocumentProcessor::get(documentFilePath);
QTC_ASSERT(processor, return false); QTC_ASSERT(processor, return false);
return completionResults(editor, QStringList(), timeOutInMs()); return !completionResults(editor, QStringList(), timeOutInMs()).isNull();
} }
Command::Ptr CompleteCommand::parse(BatchFileLineTokenizer &arguments, Command::Ptr CompleteCommand::parse(BatchFileLineTokenizer &arguments,

View File

@@ -63,7 +63,7 @@ BacktraceCollector::~BacktraceCollector()
delete d; delete d;
} }
void BacktraceCollector::run(Q_PID pid) void BacktraceCollector::run(qint64 pid)
{ {
d->debugger.start(QLatin1String("gdb"), QStringList({ d->debugger.start(QLatin1String("gdb"), QStringList({
"--nw", // Do not use a window interface. "--nw", // Do not use a window interface.

View File

@@ -36,7 +36,7 @@ public:
explicit BacktraceCollector(QObject *parent = 0); explicit BacktraceCollector(QObject *parent = 0);
~BacktraceCollector(); ~BacktraceCollector();
void run(Q_PID pid); void run(qint64 pid);
bool isRunning() const; bool isRunning() const;
void kill(); void kill();

View File

@@ -46,7 +46,7 @@ static void printErrorAndExit()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static bool hasProcessOriginFromQtCreatorBuildDir(Q_PID pid) static bool hasProcessOriginFromQtCreatorBuildDir(qint64 pid)
{ {
const QString executable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe") const QString executable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe")
.arg(QString::number(pid))); .arg(QString::number(pid)));
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
if (positionalArguments.size() != 2) if (positionalArguments.size() != 2)
printErrorAndExit(); printErrorAndExit();
Q_PID parentPid = getppid(); qint64 parentPid = getppid();
if (!hasProcessOriginFromQtCreatorBuildDir(parentPid)) if (!hasProcessOriginFromQtCreatorBuildDir(parentPid))
printErrorAndExit(); printErrorAndExit();