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

Fix SUBDIRS parsing in autotools

Browse Source 
Make this example work:

  SUBDIRS =
  SUBDIRS += \
             src
  SUBDIRS += \
             src2

Change-Id: I9beb8e6b22d2a8bf647590f872e8fe0b2c677eba
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Petar Perisin
2021-12-16 10:42:33 +01:00
parent fc25c76a4f
commit 8bc1559dc6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -83,6 +83,9 @@ bool MakefileParser::parse()
parseIncludePaths();
if (m_subDirsEmpty)
m_success = false;
return m_success;
}
@@ -308,8 +311,7 @@ void MakefileParser::parseSubDirs()
m_makefiles.removeDuplicates();
m_sources.removeDuplicates();
if (subDirs.isEmpty())
m_success = false;
m_subDirsEmpty = subDirs.isEmpty();
}
QStringList MakefileParser::directorySources(const QString &directory,
@@ -426,13 +428,14 @@ QString MakefileParser::parseIdentifierBeforeAssign(const QString &line)
{
int end = 0;
for (; end < line.size(); ++end)
if (!line[end].isLetterOrNumber() && line[end] != QLatin1Char('_'))
if (!line[end].isLetterOrNumber() && line[end] != '_')
break;
QString ret = line.left(end);
while (end < line.size() && line[end].isSpace())
++end;
return (end < line.size() && line[end] == QLatin1Char('=')) ? ret : QString();
return ((end < line.size() && line[end] == '=') ||
(end < line.size() - 1 && line[end] == '+' && line[end + 1] == '=')) ? ret : QString();
}
QStringList MakefileParser::parseTermsAfterAssign(const QString &line)