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

RemoteLinux: Respect "no_default_install" CONFIG setting.

Browse Source 
Files with this configuration will be excluded from the list of
deployables, including the build target.

Change-Id: Id1f31ee356916669eb71e911da92d02d84891087
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2012-06-01 17:09:58 +02:00
parent 8c5479eb71
commit 5337b34e87
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2342,6 +2342,8 @@ void Qt4ProFileNode::setupInstallsList(const QtSupport::ProFileReader *reader)
return;
const QStringList &itemList = reader->values(QLatin1String("INSTALLS"));
foreach (const QString &item, itemList) {
if (reader->values(item + QLatin1String(".CONFIG")).contains(QLatin1String("no_default_install")))
continue;
QString itemPath;
const QString pathVar = item + QLatin1String(".path");
const QStringList &itemPaths = reader->values(pathVar);
@@ -2360,9 +2362,6 @@ void Qt4ProFileNode::setupInstallsList(const QtSupport::ProFileReader *reader)
= reader->absoluteFileValues(item + QLatin1String(".files"),
m_projectDir, QStringList() << m_projectDir, 0);
if (item == QLatin1String("target")) {
if (!m_installsList.targetPath.isEmpty())
qDebug("%s: Overwriting existing target.path in INSTALLS list.",
qPrintable(m_projectFilePath));
m_installsList.targetPath = itemPath;
} else {
if (itemFiles.isEmpty()) {