diff options
author | hjk <hjk@qt.io> | 2020-10-08 12:55:35 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-10-08 11:16:09 +0000 |
commit | 41a51a63f53281f1c5040fd80b1e803e18299658 (patch) | |
tree | d3045cf1505dc184238bcd5acfba38b5046f69c0 /src | |
parent | 3ee70780b4b61fe10a56871916a42b4e4f06941d (diff) |
ClangCodeModel, Puppet, CrashHandler: Compile with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic65e7a5dce0a512f48fb70915b9443ef7df2b787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp index 85312170d97..b1ce0cd6ebb 100644 --- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp +++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp @@ -469,7 +469,7 @@ bool CompleteCommand::run() auto *processor = ClangEditorDocumentProcessor::get(documentFilePath); QTC_ASSERT(processor, return false); - return completionResults(editor, QStringList(), timeOutInMs()); + return !completionResults(editor, QStringList(), timeOutInMs()).isNull(); } Command::Ptr CompleteCommand::parse(BatchFileLineTokenizer &arguments, diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp index b3bc1939f7f..3f77d4ac98e 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp @@ -63,7 +63,7 @@ BacktraceCollector::~BacktraceCollector() delete d; } -void BacktraceCollector::run(Q_PID pid) +void BacktraceCollector::run(qint64 pid) { d->debugger.start(QLatin1String("gdb"), QStringList({ "--nw", // Do not use a window interface. diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.h b/src/tools/qtcreatorcrashhandler/backtracecollector.h index 50d0bee0560..6750f7105af 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.h +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.h @@ -36,7 +36,7 @@ public: explicit BacktraceCollector(QObject *parent = 0); ~BacktraceCollector(); - void run(Q_PID pid); + void run(qint64 pid); bool isRunning() const; void kill(); diff --git a/src/tools/qtcreatorcrashhandler/main.cpp b/src/tools/qtcreatorcrashhandler/main.cpp index 700e796ab3c..ca5c9250ab2 100644 --- a/src/tools/qtcreatorcrashhandler/main.cpp +++ b/src/tools/qtcreatorcrashhandler/main.cpp @@ -46,7 +46,7 @@ static void printErrorAndExit() exit(EXIT_FAILURE); } -static bool hasProcessOriginFromQtCreatorBuildDir(Q_PID pid) +static bool hasProcessOriginFromQtCreatorBuildDir(qint64 pid) { const QString executable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe") .arg(QString::number(pid))); @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) if (positionalArguments.size() != 2) printErrorAndExit(); - Q_PID parentPid = getppid(); + qint64 parentPid = getppid(); if (!hasProcessOriginFromQtCreatorBuildDir(parentPid)) printErrorAndExit(); |