From e638dc8232ca7dfeef958116901c7e226e4bb5e8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 6 Jun 2012 11:47:32 +0200 Subject: [PATCH] Fix compilation error with C++11: space needed for string concatenation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The error was: filenamevalidatinglineedit.cpp:101:47: error: unable to find string literal operator ‘operator"" SLASHES’ Change-Id: If990dd75a7b2cb4186b81115087c66e0dd1d888b Reviewed-by: Bradley T. Hughes --- src/libs/utils/filenamevalidatinglineedit.cpp | 2 +- src/plugins/android/androidconfigurations.cpp | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index 04d7a637727..226193fe27c 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -98,7 +98,7 @@ void FileNameValidatingLineEdit::setForceFirstCapitalLetter(bool b) #define SLASHES "/\\" static const char notAllowedCharsSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "; -static const char notAllowedCharsNoSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "SLASHES; +static const char notAllowedCharsNoSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' " SLASHES; static const char *notAllowedSubStrings[] = {".."}; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 2427756d5d8..88ee1144bf9 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -264,7 +264,7 @@ QStringList AndroidConfigurations::ndkToolchainVersions() const QString AndroidConfigurations::adbToolPath() const { - return m_config.sdkLocation + QLatin1String("/platform-tools/adb"ANDROID_EXE_SUFFIX); + return m_config.sdkLocation + QLatin1String("/platform-tools/adb" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::androidToolPath() const @@ -272,13 +272,13 @@ 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); + return m_config.sdkLocation + QLatin1String("/tools/android" ANDROID_EXE_SUFFIX); #endif } @@ -292,7 +292,7 @@ QString AndroidConfigurations::antToolPath() const QString AndroidConfigurations::emulatorToolPath() const { - return m_config.sdkLocation + QLatin1String("/tools/emulator"ANDROID_EXE_SUFFIX); + return m_config.sdkLocation + QLatin1String("/tools/emulator" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::toolPath(ProjectExplorer::Abi::Architecture architecture) const @@ -306,17 +306,17 @@ QString AndroidConfigurations::toolPath(ProjectExplorer::Abi::Architecture archi QString AndroidConfigurations::stripPath(ProjectExplorer::Abi::Architecture architecture) const { - return toolPath(architecture) + QLatin1String("-strip"ANDROID_EXE_SUFFIX); + return toolPath(architecture) + QLatin1String("-strip" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::readelfPath(ProjectExplorer::Abi::Architecture architecture) const { - return toolPath(architecture) + QLatin1String("-readelf"ANDROID_EXE_SUFFIX); + return toolPath(architecture) + QLatin1String("-readelf" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::gccPath(ProjectExplorer::Abi::Architecture architecture) const { - return toolPath(architecture) + QLatin1String("-gcc"ANDROID_EXE_SUFFIX); + return toolPath(architecture) + QLatin1String("-gcc" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::gdbServerPath(ProjectExplorer::Abi::Architecture architecture) const @@ -357,7 +357,7 @@ QString AndroidConfigurations::gdbPath(ProjectExplorer::Abi::Architecture archit } if (!gdbPath.isEmpty()) return gdbPath; - return toolPath(architecture) + QLatin1String("-gdb"ANDROID_EXE_SUFFIX); + return toolPath(architecture) + QLatin1String("-gdb" ANDROID_EXE_SUFFIX); } QString AndroidConfigurations::openJDKPath() const