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

Merge "Merge remote-tracking branch 'origin/9.0'"

Browse Source
This commit is contained in:
The Qt Project
2022-10-12 08:21:58 +00:00
parent caa013b8e8 0c1ca4242f
commit 634ac23af7
11 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mesonprojectmanager/mesonprocess.cpp
View File

@@ -60,6 +60,8 @@ void MesonProcess::handleProcessDone()
void MesonProcess::setupProcess(const Command &command, const Environment &env,
const QString &projectName, bool captureStdo)
{
if (m_process)
m_process.release()->deleteLater();
m_process.reset(new QtcProcess);
connect(m_process.get(), &QtcProcess::done, this, &MesonProcess::handleProcessDone);
if (!captureStdo) {

20
src/plugins/mesonprojectmanager/mesonprojectparser.cpp
View File

@@ -196,20 +196,18 @@ QList<ProjectExplorer::BuildTargetInfo> MesonProjectParser::appsTargets() const
}
return apps;
}
bool MesonProjectParser::startParser()
{
m_parserFutureResult = Utils::runAsync(
ProjectExplorer::ProjectExplorerPlugin::sharedThreadPool(),
[process = &m_process,
introType = m_introType,
buildDir = m_buildDir.toString(),
srcDir = m_srcDir]() {
if (introType == IntroDataType::file) {
return extractParserResults(srcDir, MesonInfoParser::parse(buildDir));
} else {
return extractParserResults(srcDir, MesonInfoParser::parse(process->stdOut()));
}
});
ProjectExplorer::ProjectExplorerPlugin::sharedThreadPool(),
[processOutput = m_process.stdOut(), introType = m_introType,
buildDir = m_buildDir.toString(), srcDir = m_srcDir] {
if (introType == IntroDataType::file)
return extractParserResults(srcDir, MesonInfoParser::parse(buildDir));
else
return extractParserResults(srcDir, MesonInfoParser::parse(processOutput));
});
Utils::onFinished(m_parserFutureResult, this, &MesonProjectParser::update);
return true;