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

AutotoolsPM: Inline updateCppCodeModel()

Browse Source 
Change-Id: I68885dda050f7942165da74e8011a25bcc075530
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-15 11:40:01 +02:00
parent 4a6db9fd74
commit 9616254534
2 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp
View File

@@ -52,6 +52,23 @@ void AutotoolsBuildSystem::triggerParsing()
m_makefileParserThread->start();
}
static QStringList filterIncludes(const QString &absSrc, const QString &absBuild,
const QStringList &in)
{
QStringList result;
for (const QString &i : in) {
QString out = i;
out.replace(QLatin1String("$(top_srcdir)"), absSrc);
out.replace(QLatin1String("$(abs_top_srcdir)"), absSrc);
out.replace(QLatin1String("$(top_builddir)"), absBuild);
out.replace(QLatin1String("$(abs_top_builddir)"), absBuild);
result << out;
}
return result;
}
void AutotoolsBuildSystem::makefileParsingFinished()
{
// The parsing has been cancelled by the user. Don't show any project data at all.
@@ -104,33 +121,6 @@ void AutotoolsBuildSystem::makefileParsingFinished()
setRootProjectNode(std::move(newRoot));
project()->setExtraProjectFiles(filesToWatch);
updateCppCodeModel();
m_makefileParserThread.release()->deleteLater();
emitBuildSystemUpdated();
}
static QStringList filterIncludes(const QString &absSrc, const QString &absBuild,
const QStringList &in)
{
QStringList result;
for (const QString &i : in) {
QString out = i;
out.replace(QLatin1String("$(top_srcdir)"), absSrc);
out.replace(QLatin1String("$(abs_top_srcdir)"), absSrc);
out.replace(QLatin1String("$(top_builddir)"), absBuild);
out.replace(QLatin1String("$(abs_top_builddir)"), absBuild);
result << out;
}
return result;
}
void AutotoolsBuildSystem::updateCppCodeModel()
{
QtSupport::CppKitInfo kitInfo(kit());
QTC_ASSERT(kitInfo.isValid(), return );
@@ -157,6 +147,10 @@ void AutotoolsBuildSystem::updateCppCodeModel()
rpp.setFiles(m_files);
m_cppCodeModelUpdater->update({project(), kitInfo, activeParseEnvironment(), {rpp}});
m_makefileParserThread.release()->deleteLater();
emitBuildSystemUpdated();
}
} // AutotoolsProjectManager::Internal