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

Compile fix

Browse Source 
Change-Id: Ic323f2fc1274128edf367305f690807eea73e366
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Robert Loehning
2012-04-24 14:19:06 +02:00
committed by Daniel Teske
parent 9ad3362f64
commit 9283d7d50f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,11 +271,11 @@ QString AndroidConfigurations::androidToolPath() const
#ifdef Q_OS_WIN32
// I want to switch from using android.bat to using an executable. All it really does is call
// Java and I've made some progress on it. So if android.exe exists, return that instead.
QFileInfo fi(m_config.SDKLocation + QLatin1String("/tools/android"ANDROID_EXE_SUFFIX));
QFileInfo fi(m_config.sdkLocation + QLatin1String("/tools/android"ANDROID_EXE_SUFFIX));
if (fi.exists())
return m_config.SDKLocation + QString("/tools/android"ANDROID_EXE_SUFFIX);
return m_config.sdkLocation + QString("/tools/android"ANDROID_EXE_SUFFIX);
else
return m_config.SDKLocation + QLatin1String("/tools/android"ANDROID_BAT_SUFFIX);
return m_config.sdkLocation + QLatin1String("/tools/android"ANDROID_BAT_SUFFIX);
#else
return m_config.sdkLocation + QLatin1String("/tools/android"ANDROID_EXE_SUFFIX);
#endif