fix C++11 string literal incompatibility

Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp
index 0acd91b524..95e91a40ad 100644
--- a/src/plugins/bazaar/bazaareditor.cpp
+++ b/src/plugins/bazaar/bazaareditor.cpp
@@ -69,11 +69,11 @@ QSet<QString> BazaarEditor::annotationChanges() const
     if (txt.isEmpty())
         return changes;
 
-    QRegExp changeNumRx(QLatin1String("^("BZR_CHANGE_PATTERN") "));
+    QRegExp changeNumRx(QLatin1String("^(" BZR_CHANGE_PATTERN ") "));
     QTC_ASSERT(changeNumRx.isValid(), return changes);
     if (changeNumRx.indexIn(txt) != -1) {
         changes.insert(changeNumRx.cap(1));
-        changeNumRx.setPattern(QLatin1String("\n("BZR_CHANGE_PATTERN") "));
+        changeNumRx.setPattern(QLatin1String("\n(" BZR_CHANGE_PATTERN ") "));
         QTC_ASSERT(changeNumRx.isValid(), return changes);
         int pos = 0;
         while ((pos = changeNumRx.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp
index f0292a15d4..5c94bff43e 100644
--- a/src/plugins/cvs/cvseditor.cpp
+++ b/src/plugins/cvs/cvseditor.cpp
@@ -48,13 +48,13 @@ namespace Internal {
 
 // Match a CVS revision ("1.1.1.1")
 #define CVS_REVISION_PATTERN "[\\d\\.]+"
-#define CVS_REVISION_AT_START_PATTERN "^("CVS_REVISION_PATTERN") "
+#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") "
 
 CVSEditor::CVSEditor(const VCSBase::VCSBaseEditorParameters *type,
                                    QWidget *parent) :
     VCSBase::VCSBaseEditorWidget(type, parent),
     m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")),
-    m_revisionLogPattern(QLatin1String("^revision  *("CVS_REVISION_PATTERN")$"))
+    m_revisionLogPattern(QLatin1String("^revision  *(" CVS_REVISION_PATTERN ")$"))
 {
     QTC_ASSERT(m_revisionAnnotationPattern.isValid(), return);
     QTC_ASSERT(m_revisionLogPattern.isValid(), return);
@@ -72,7 +72,7 @@ QSet<QString> CVSEditor::annotationChanges() const
     QTC_ASSERT(r.isValid(), return changes);
     if (r.indexIn(txt) != -1) {
         changes.insert(r.cap(1));
-        r.setPattern(QLatin1String("\n("CVS_REVISION_PATTERN") "));
+        r.setPattern(QLatin1String("\n(" CVS_REVISION_PATTERN ") "));
         QTC_ASSERT(r.isValid(), return changes);
         int pos = 0;
         while ((pos = r.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 6256a8440a..25e149af23 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -442,7 +442,7 @@ CdbEngine::CdbEngine(const DebuggerStartParameters &sp,
     m_specialStopMode(NoSpecialStop),
     m_nextCommandToken(0),
     m_currentBuiltinCommandIndex(-1),
-    m_extensionCommandPrefixBA("!"QT_CREATOR_CDB_EXT"."),
+    m_extensionCommandPrefixBA("!" QT_CREATOR_CDB_EXT "."),
     m_operateByInstructionPending(true),
     m_operateByInstruction(true), // Default CDB setting
     m_notifyEngineShutdownOnTermination(false),
@@ -573,7 +573,7 @@ QString CdbEngine::extensionLibraryName(bool is64Bit)
     // Determine extension lib name and path to use
     QString rc;
     QTextStream(&rc) << QFileInfo(QCoreApplication::applicationDirPath()).path()
-                     << "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT"64" : QT_CREATOR_CDB_EXT"32")
+                     << "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT "64" : QT_CREATOR_CDB_EXT "32")
                      << '/' << QT_CREATOR_CDB_EXT << ".dll";
     return rc;
 }
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 686acb971a..8c933a8ee4 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -80,11 +80,11 @@ QSet<QString> GitEditor::annotationChanges() const
     if (txt.isEmpty())
         return changes;
     // Hunt for first change number in annotation: "<change>:"
-    QRegExp r(QLatin1String("^("CHANGE_PATTERN_8C") "));
+    QRegExp r(QLatin1String("^(" CHANGE_PATTERN_8C ") "));
     QTC_ASSERT(r.isValid(), return changes);
     if (r.indexIn(txt) != -1) {
         changes.insert(r.cap(1));
-        r.setPattern(QLatin1String("\n("CHANGE_PATTERN_8C") "));
+        r.setPattern(QLatin1String("\n(" CHANGE_PATTERN_8C ") "));
         QTC_ASSERT(r.isValid(), return changes);
         int pos = 0;
         while ((pos = r.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
index 463f0154c8..03b5de19ff 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
@@ -43,18 +43,18 @@
 #define LIBRARY_MACRO_VARIABLE "<LIBRARY_MACRO>"
 
 static const char *globalHeaderContentsC =
-"#ifndef "GUARD_VARIABLE"\n"
-"#define "GUARD_VARIABLE"\n"
+"#ifndef " GUARD_VARIABLE "\n"
+"#define " GUARD_VARIABLE "\n"
 "\n"
 "#include <QtCore/qglobal.h>\n"
 "\n"
-"#if defined("LIBRARY_MACRO_VARIABLE")\n"
-"#  define "EXPORT_MACRO_VARIABLE" Q_DECL_EXPORT\n"
+"#if defined(" LIBRARY_MACRO_VARIABLE ")\n"
+"#  define " EXPORT_MACRO_VARIABLE " Q_DECL_EXPORT\n"
 "#else\n"
-"#  define "EXPORT_MACRO_VARIABLE" Q_DECL_IMPORT\n"
+"#  define " EXPORT_MACRO_VARIABLE " Q_DECL_IMPORT\n"
 "#endif\n"
 "\n"
-"#endif // "GUARD_VARIABLE"\n";
+"#endif // " GUARD_VARIABLE "\n";
 
 namespace Qt4ProjectManager {
 namespace Internal {