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

Symbian: Correctly ignore certain deployment rules

Browse Source 
Reviewed-By: Pawel Polanski
Task-Nr: QTCREATORBUG-4840
This commit is contained in:
dt_
2011-05-10 16:18:04 +02:00
parent 4e83d167ae
commit c450abfe3f
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,6 +1321,11 @@ QStringList Qt4ProFileNode::symbianCapabilities() const
return result;
}
bool Qt4ProFileNode::isDeployable() const
{
return m_isDeployable;
}
/*!
\class Qt4ProFileNode
Implements abstract ProjectNode class
@@ -1753,7 +1758,18 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
QLatin1String("QML_IMPORT_PATH"), m_projectDir);
newVarValues[Makefile] = m_readerExact->values("MAKEFILE");
newVarValues[SymbianCapabilities] = m_readerExact->values("TARGET.CAPABILITY");
newVarValues[Deployment] = m_readerExact->values("DEPLOYMENT");
m_isDeployable = false;
if (m_projectType == ApplicationTemplate) {
m_isDeployable = true;
} else {
foreach (const QString &item, m_readerExact->values("DEPLOYMENT")) {
if (!m_readerExact->values(item + ".sources").isEmpty()) {
m_isDeployable = true;
break;
}
}
}
if (m_varValues != newVarValues) {
Qt4VariablesHash oldValues = m_varValues;