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

2
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -252,7 +252,7 @@ void CreateAndroidManifestWizard::createAndroidManifestFile()
QString value = QLatin1String("$$PWD/")
+ QDir(m_target->project()->projectDirectory()).relativeFilePath(dir);
bool result =
m_node->setProVariable(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"), value);
m_node->setProVariable(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"), QStringList(value));
QStringList unChanged;
m_node->addFiles(QStringList(fileName), &unChanged);