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

make qmake property map ProString-based

Browse Source 
Change-Id: I3c25642b885171a47e8fd27e39e5d470d9f24db3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 17:42:20 +02:00
parent 5b788ea23f
commit da26368d9e
10 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/proparser/qmakeparser.cpp
View File

@@ -450,7 +450,7 @@ bool QMakeParser::read(ProFile *pro, const QString &in)
tok = TokVariable;
c = *cur;
if (c == '[') {
ptr += 2;
ptr += 4;
tok = TokProperty;
term = ']';
c = *++cur;
@@ -488,18 +488,19 @@ bool QMakeParser::read(ProFile *pro, const QString &in)
wordCount++;
}
tlen = ptr - xprPtr;
if (rtok == TokVariable) {
if (!resolveVariable(xprPtr, tlen, needSep, &ptr,
&buf, &xprBuff, &tokPtr, &tokBuff, cur, in)) {
if (rtok != TokVariable
|| !resolveVariable(xprPtr, tlen, needSep, &ptr,
&buf, &xprBuff, &tokPtr, &tokBuff, cur, in)) {
if (rtok == TokVariable || rtok == TokProperty) {
xprPtr[-4] = tok;
uint hash = ProString::hash((const QChar *)xprPtr, tlen);
xprPtr[-3] = (ushort)hash;
xprPtr[-2] = (ushort)(hash >> 16);
xprPtr[-1] = tlen;
} else {
xprPtr[-2] = tok;
xprPtr[-1] = tlen;
}
} else {
xprPtr[-2] = tok;
xprPtr[-1] = tlen;
}
if ((tok & TokMask) == TokFuncName) {
cur++;