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

collect /get and /raw properties in QMakeGlobals::initProperties(), too

Browse Source 
this is only for lupdate & co.

Change-Id: I438bba7dd996045e9ec947e6027e3085cc862884
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-05-04 16:05:36 +02:00
parent 9c46bd5dec
commit 8471c0edad
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/proparser/qmakeglobals.cpp
View File

@@ -216,8 +216,18 @@ bool QMakeGlobals::initProperties(const QString &qmake)
continue;
if (line.endsWith('\r'))
line.chop(1);
properties.insert(QString::fromLatin1(line.left(off)),
QString::fromLocal8Bit(line.mid(off + 1)));
const QString name = QString::fromLatin1(line.left(off));
const QString value = QDir::fromNativeSeparators(
QString::fromLocal8Bit(line.mid(off + 1)));
properties.insert(name, value);
if (name.startsWith(QLatin1String("QT_")) && !name.contains(QLatin1Char('/'))) {
if (name.startsWith(QLatin1String("QT_INSTALL_"))) {
properties.insert(name + QLatin1String("/raw"), value);
properties.insert(name + QLatin1String("/get"), value);
} else if (name.startsWith(QLatin1String("QT_HOST_"))) {
properties.insert(name + QLatin1String("/get"), value);
}
}
}
return true;
}