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

CMakeValidator: Make code more robust

Browse Source 
Change-Id: Ibfe0572adee9d5ffe98259465d5070448d704e1c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2013-03-13 13:31:41 +01:00
parent a6a8e235c0
commit 57d4d9480b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakevalidator.cpp
View File

@@ -223,6 +223,8 @@ void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
QList<QByteArray> cmakeCommandsHelp = output.split('\n'); QList<QByteArray> cmakeCommandsHelp = output.split('\n');
for (int i = 0; i < cmakeCommandsHelp.count(); ++i) { for (int i = 0; i < cmakeCommandsHelp.count(); ++i) {
QByteArray lineTrimmed = cmakeCommandsHelp.at(i).trimmed(); QByteArray lineTrimmed = cmakeCommandsHelp.at(i).trimmed();
if (cmakeFunctionsList.isEmpty())
break;
if (cmakeFunctionsList.first().toLatin1() == lineTrimmed) { if (cmakeFunctionsList.first().toLatin1() == lineTrimmed) {
QStringList commandSyntaxes; QStringList commandSyntaxes;
QString currentCommandSyntax; QString currentCommandSyntax;
@@ -231,7 +233,7 @@ void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
for (; i < cmakeCommandsHelp.count(); ++i) { for (; i < cmakeCommandsHelp.count(); ++i) {
lineTrimmed = cmakeCommandsHelp.at(i).trimmed(); lineTrimmed = cmakeCommandsHelp.at(i).trimmed();
if (cmakeFunctionsList.first().toLatin1() == lineTrimmed) { if (!cmakeFunctionsList.isEmpty() && cmakeFunctionsList.first().toLatin1() == lineTrimmed) {
//start of next function in output //start of next function in output
if (!currentCommandSyntax.isEmpty()) if (!currentCommandSyntax.isEmpty())
commandSyntaxes << currentCommandSyntax.append(QLatin1String("</table>")); commandSyntaxes << currentCommandSyntax.append(QLatin1String("</table>"));