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

CMake: Only handle strings at start of line

Browse Source 
Allow comments at the start of line only (or after only space characters) in
CMakeCache.txt-style lines.

Task-number: QTCREATORBUG-18385
Change-Id: I8b69144ea4f6a667ae1df382c8c4c1e88eca799b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-06-20 11:47:36 +02:00
parent 8542ebcd5d
commit a027f1cfce
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -170,15 +170,20 @@ std::function<bool (const CMakeConfigItem &a, const CMakeConfigItem &b)> CMakeCo
CMakeConfigItem CMakeConfigItem::fromString(const QString &s) CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
{ {
// Strip comments: // Strip comments (only at start of line!):
int commentStart = s.count(); int commentStart = s.count();
int pos = s.indexOf(QLatin1Char('#')); for (int i = 0; i < s.count(); ++i) {
if (pos >= 0) const QChar c = s.at(i);
commentStart = pos; if (c == ' ' || c == '\t')
pos = s.indexOf(QLatin1String("//")); continue;
if (pos >= 0 && pos < commentStart) else if ((c == '#')
commentStart = pos; || (c == '/' && i < s.count() - 1 && s.at(i + 1) == '/')) {
commentStart = i;
break;
} else {
break;
}
}
const QString line = s.mid(0, commentStart); const QString line = s.mid(0, commentStart);
// Split up line: // Split up line: