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

Fixed a crash when deleting files from a project under certain conditions

Browse Source 
Task-number: QTCREATORBUG-1804
Merge-request: 2168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Sebastian Hartte
2010-07-06 15:19:53 +02:00
committed by Oswald Buddenhagen
parent 8af5c9e14e
commit 7feed7318b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/proparser/prowriter.cpp
View File

@@ -229,18 +229,18 @@ void ProWriter::addVarValues(ProFile *profile, QStringList *lines,
}
static void findProVariables(const ushort *tokPtr, const QStringList &vars,
QList<int> *proVars)
QList<int> *proVars, const uint firstLine = 0)
{
int lineNo = 0;
int lineNo = firstLine;
QString tmp;
const ushort *lastXpr = 0;
while (ushort tok = *tokPtr++) {
if (tok == TokBranch) {
uint blockLen = getBlockLen(tokPtr);
findProVariables(tokPtr, vars, proVars);
findProVariables(tokPtr, vars, proVars, lineNo);
tokPtr += blockLen;
blockLen = getBlockLen(tokPtr);
findProVariables(tokPtr, vars, proVars);
findProVariables(tokPtr, vars, proVars, lineNo);
tokPtr += blockLen;
} else if (tok == TokAssign || tok == TokAppend || tok == TokAppendUnique) {
if (getLiteral(lastXpr, tokPtr - 1, tmp) && vars.contains(tmp))