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

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

@@ -210,27 +210,35 @@ bool QMakeGlobals::initProperties(const QString &qmake)
if (line.endsWith('\r'))
line.chop(1);
QString name = QString::fromLatin1(line.left(off));
QString value = QDir::fromNativeSeparators(
QString::fromLocal8Bit(line.mid(off + 1)));
properties.insert(name, value);
ProString value = ProString(QDir::fromNativeSeparators(
QString::fromLocal8Bit(line.mid(off + 1))), ProStringConstants::NoHash);
properties.insert(ProString(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);
properties.insert(ProString(name + QLatin1String("/raw")), value);
properties.insert(ProString(name + QLatin1String("/get")), value);
if (name == QLatin1String("QT_INSTALL_PREFIX")
|| name == QLatin1String("QT_INSTALL_DATA")
|| name == QLatin1String("QT_INSTALL_BINS")) {
name.replace(3, 7, QLatin1String("HOST"));
properties.insert(name, value);
properties.insert(name + QLatin1String("/get"), value);
properties.insert(ProString(name), value);
properties.insert(ProString(name + QLatin1String("/get")), value);
}
} else if (name.startsWith(QLatin1String("QT_HOST_"))) {
properties.insert(name + QLatin1String("/get"), value);
properties.insert(ProString(name + QLatin1String("/get")), value);
}
}
}
properties.insert(ProString("QMAKE_VERSION"), ProString("2.01a", ProStringConstants::NoHash));
return true;
}
#else
void QMakeGlobals::setProperties(const QHash<QString, QString> &props)
{
QHash<QString, QString>::ConstIterator it = props.constBegin(), eit = props.constEnd();
for (; it != eit; ++it)
properties.insert(ProString(it.key()), ProString(it.value(), ProStringConstants::NoHash));
}
#endif
QT_END_NAMESPACE