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

Fix compilation error with C++11: space needed for string concatenation

Browse Source 
The error was:
filenamevalidatinglineedit.cpp:101:47: error: unable to find string literal operator ‘operator"" SLASHES’

Change-Id: If990dd75a7b2cb4186b81115087c66e0dd1d888b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Thiago Macieira
2012-06-06 11:47:32 +02:00
committed by Eike Ziller
parent 545f9846d5
commit e638dc8232
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/filenamevalidatinglineedit.cpp
View File

@@ -98,7 +98,7 @@ void FileNameValidatingLineEdit::setForceFirstCapitalLetter(bool b)
#define SLASHES "/\\" #define SLASHES "/\\"
static const char notAllowedCharsSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "; static const char notAllowedCharsSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' ";
static const char notAllowedCharsNoSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "SLASHES; static const char notAllowedCharsNoSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' " SLASHES;
static const char *notAllowedSubStrings[] = {".."}; static const char *notAllowedSubStrings[] = {".."};

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

@@ -264,7 +264,7 @@ QStringList AndroidConfigurations::ndkToolchainVersions() const
QString AndroidConfigurations::adbToolPath() 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 QString AndroidConfigurations::androidToolPath() const
@@ -272,13 +272,13 @@ QString AndroidConfigurations::androidToolPath() const
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// 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.
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()) if (fi.exists())
return m_config.sdkLocation + QString("/tools/android"ANDROID_EXE_SUFFIX); return m_config.sdkLocation + QString("/tools/android" ANDROID_EXE_SUFFIX);
else else
return m_config.sdkLocation + QLatin1String("/tools/android"ANDROID_BAT_SUFFIX); return m_config.sdkLocation + QLatin1String("/tools/android" ANDROID_BAT_SUFFIX);
#else #else
return m_config.sdkLocation + QLatin1String("/tools/android"ANDROID_EXE_SUFFIX); return m_config.sdkLocation + QLatin1String("/tools/android" ANDROID_EXE_SUFFIX);
#endif #endif
} }
@@ -292,7 +292,7 @@ QString AndroidConfigurations::antToolPath() const
QString AndroidConfigurations::emulatorToolPath() 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 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 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 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 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 QString AndroidConfigurations::gdbServerPath(ProjectExplorer::Abi::Architecture architecture) const
@@ -357,7 +357,7 @@ QString AndroidConfigurations::gdbPath(ProjectExplorer::Abi::Architecture archit
} }
if (!gdbPath.isEmpty()) if (!gdbPath.isEmpty())
return gdbPath; return gdbPath;
return toolPath(architecture) + QLatin1String("-gdb"ANDROID_EXE_SUFFIX); return toolPath(architecture) + QLatin1String("-gdb" ANDROID_EXE_SUFFIX);
} }
QString AndroidConfigurations::openJDKPath() const QString AndroidConfigurations::openJDKPath() const