From bfad1c0f5087b328894be4dac1d3a3e03226c06b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 4 Sep 2012 13:45:03 +0200 Subject: [PATCH] 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: hjk --- src/plugins/android/androidconfigurations.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 453c4b57462..5199a546217 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -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"));