Commit bfad1c0f authored by Thiago Macieira's avatar Thiago Macieira Committed by hjk

Fix compilation in C++11 mode.

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: default avatarhjk <qthjk@ovi.com>
parent 415b19d7
......@@ -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
// Java and I've made some progress on it. So if android.exe exists, return that instead.
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())
return path;
path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"ANDROID_BAT_SUFFIX));
return path.appendPath(QLatin1String("tools/android" ANDROID_BAT_SUFFIX));
} else {
FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment