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

Maemo: Remove additional parsing step.

Browse Source 
Instead, utilize the newly added INSTALLS information of Qt4ProFileNode.

Task-number: QTCREATORBUG-2679
This commit is contained in:
Christian Kandeler
2010-10-28 09:22:19 +02:00
parent 78b2f25791
commit dbd3965241
9 changed files with 13 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1942,7 +1942,7 @@ void Qt4ProFileNode::setupInstallsList(const ProFileReader *reader)
const QStringList &itemList = reader->values(QLatin1String("INSTALLS"));
foreach (const QString &item, itemList) {
QString itemPath;
const QString pathVar = item + QLatin1String(".path");
const QString pathVar = item + QLatin1String(".path");
const QStringList &itemPaths = reader->values(pathVar);
if (itemPaths.count() != 1) {
qDebug("Invalid RHS: Variable '%s' has %d values.",
@@ -1951,10 +1951,9 @@ void Qt4ProFileNode::setupInstallsList(const ProFileReader *reader)
qDebug("Ignoring INSTALLS item '%s', because it has no path.",
qPrintable(item));
continue;
} else {
itemPath = itemPaths.last();
}
}
itemPath = itemPaths.last();
const QStringList &itemFiles
= reader->absoluteFileValues(item + QLatin1String(".files"),