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

Merge branch '2.2'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
This commit is contained in:
Oswald Buddenhagen
2011-06-23 19:46:43 +02:00
parent 1f8de24e2c 568985ab03
commit 1d78e594d8
23 changed files with 2115 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/proparser/profileparser.cpp
View File

@@ -515,7 +515,6 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
goto newWord;
}
if (term) {
cur++;
checkTerm:
if (c != term) {
parseError(fL1S("Missing %1 terminator [found %2]")
@@ -523,9 +522,9 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
.arg(c ? QString(c) : QString::fromLatin1("end-of-line")));
pro->setOk(false);
m_inError = true;
if (c)
cur--;
// Just parse on, as if there was a terminator ...
} else {
cur++;
}
}
joinToken:
@@ -585,7 +584,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
finalizeCall(tokPtr, buf, ptr, theargc);
goto nextItem;
} else if (term == '}') {
c = (cur == end) ? 0 : *cur++;
c = (cur == end) ? 0 : *cur;
goto checkTerm;
} else {
Q_ASSERT(!term);