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

Fix compilation in C++11 mode.

Browse Source 
The error was:
 error: unable to find string literal operator 'operator"" ANDROID_EXE_SUFFIX'

C++11 requires a space between two string literals to form
concatenation.

Change-Id: I346ca1d52add74536d1fdb60efb9af7dca69d80c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Thiago Macieira
2012-09-04 13:45:03 +02:00
committed by hjk
parent 415b19d7e1
commit bfad1c0f50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,11 +273,11 @@ FileName AndroidConfigurations::androidToolPath() const
// I want to switch from using android.bat to using an executable. All it really does is call // 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. // Java and I've made some progress on it. So if android.exe exists, return that instead.
FileName path = m_config.sdkLocation; FileName path = m_config.sdkLocation;
path.appendPath(QLatin1String("tools/android"ANDROID_EXE_SUFFIX)); path.appendPath(QLatin1String("tools/android" ANDROID_EXE_SUFFIX));
if (path.toFileInfo().exists()) if (path.toFileInfo().exists())
return path; return path;
path = m_config.sdkLocation; path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"ANDROID_BAT_SUFFIX)); return path.appendPath(QLatin1String("tools/android" ANDROID_BAT_SUFFIX));
} else { } else {
FileName path = m_config.sdkLocation; FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android")); return path.appendPath(QLatin1String("tools/android"));