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

Fix Android plugin.

Browse Source 
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
BogDan Vatra
2012-06-23 12:24:44 +03:00
committed by Tobias Hunger
parent a1d4afad67
commit bb0573a8aa
12 changed files with 183 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidconfigurations.cpp
View File

@@ -214,7 +214,8 @@ void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
void AndroidConfigurations::updateAvailablePlatforms()
{
m_availablePlatforms.clear();
QDirIterator it(m_config.ndkLocation.appendPath(QLatin1String("platforms")).toString(), QStringList() << QLatin1String("android-*"), QDir::Dirs);
Utils::FileName path = m_config.ndkLocation;
QDirIterator it(path.appendPath(QLatin1String("platforms")).toString(), QStringList() << QLatin1String("android-*"), QDir::Dirs);
while (it.hasNext()) {
const QString &fileName = it.next();
m_availablePlatforms.push_back(fileName.mid(fileName.lastIndexOf(QLatin1Char('-')) + 1).toInt());
@@ -282,7 +283,7 @@ Utils::FileName AndroidConfigurations::androidToolPath() const
return path.appendPath(QLatin1String("tools/android"ANDROID_BAT_SUFFIX));
#else
Utils::FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"ANDROID_EXE_SUFFIX));
return path.appendPath(QLatin1String("tools/android"));
#endif
}