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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
This commit is contained in:
Eike Ziller
2013-06-27 14:24:57 +02:00
parent 9055eea11f 6c8f87556a
commit c9128b7fdd
71 changed files with 767 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androidtoolchain.cpp
View File

@@ -116,6 +116,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
QString javaHome = AndroidConfigurations::instance().openJDKPath().toString();
if (!javaHome.isEmpty() && QFileInfo(javaHome).exists())
env.set(QLatin1String("JAVA_HOME"), javaHome);
env.set(QLatin1String("ANDROID_HOME"), AndroidConfigurations::instance().config().sdkLocation.toString());
}
bool AndroidToolChain::operator ==(const ToolChain &tc) const