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

Android: Set ANDROID_EXTRA_LIBS scoped to the arch

Browse Source 
The workflow for adding a library for multiple archs is not ideal, but
now a little better. The user has to go to the deploy setting for a
kit per architecture and add the right extra library.

Change-Id: I2bda6961f6f1164bdc58acd78fa3d2221977f0cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Daniel Teske
2014-03-07 12:56:59 +01:00
parent 43579c9bc6
commit 765ad6c3d2
8 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1214,7 +1214,7 @@ void QmakePriFileNode::changeFiles(const QString &mimeType,
includeFile->deref();
}
bool QmakePriFileNode::setProVariable(const QString &var, const QString &value)
bool QmakePriFileNode::setProVariable(const QString &var, const QStringList &values, const QString &scope, int flags)
{
if (!ensureWriteableProFile(m_projectFilePath))
return false;
@@ -1223,8 +1223,9 @@ bool QmakePriFileNode::setProVariable(const QString &var, const QString &value)
ProFile *includeFile = pair.first;
QStringList lines = pair.second;
ProWriter::putVarValues(includeFile, &lines, QStringList(value), var,
ProWriter::ReplaceValues | ProWriter::OneLine | ProWriter::AssignOperator);
ProWriter::putVarValues(includeFile, &lines, values, var,
ProWriter::PutFlags(flags),
scope);
if (!includeFile)
return false;