Use Utilities.cStringQuote in qbs project files

This function has been available since 1.8.

Change-Id: I0114bf8ec41f3be0c306be943d15599e09f69cc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

12 files changed, 33 insertions, 33 deletions

diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs
index ae4c0ab72..f22fe5de5 100644
--- a/src/app/qbs/qbs.qbs
+++ b/src/app/qbs/qbs.qbs
@@ -1,15 +1,15 @@
 import qbs 1.0
+import qbs.Utilities
 
 QbsApp {
     name: "qbs_app"
     Depends { name: "qbs resources" }
     targetName: "qbs"
-    // TODO: Use Utilities.cStringQuote
     cpp.defines: base.concat([
-        'QBS_VERSION="' + qbsversion.version + '"',
-        'QBS_RELATIVE_LIBEXEC_PATH="' + qbsbuildconfig.relativeLibexecPath + '"',
-        'QBS_RELATIVE_SEARCH_PATH="' + qbsbuildconfig.relativeSearchPath + '"',
-        'QBS_RELATIVE_PLUGINS_PATH="' + qbsbuildconfig.relativePluginsPath + '"',
+        "QBS_VERSION=" + Utilities.cStringQuote(qbsversion.version),
+        "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
+        "QBS_RELATIVE_SEARCH_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeSearchPath),
+        "QBS_RELATIVE_PLUGINS_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativePluginsPath),
     ])
     files: [
         "application.cpp",
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 570eb4605..e59614467 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -1,4 +1,5 @@
 import qbs 1.0
+import qbs.Utilities
 
 QbsLibrary {
     Depends { name: "cpp" }
@@ -14,10 +15,9 @@ QbsLibrary {
         qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : []
     property stringList enableUnitTestsDefines:
         qbsbuildconfig.enableUnitTests ? ["QBS_ENABLE_UNIT_TESTS"] : []
-    // TODO: Use Utilities.cStringQuote
     cpp.defines: base.concat([
-        'QBS_RELATIVE_LIBEXEC_PATH="' + qbsbuildconfig.relativeLibexecPath + '"',
-        "QBS_VERSION=\"" + version + "\"",
+        "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
+        "QBS_VERSION=" + Utilities.cStringQuote(version),
     ]).concat(projectFileUpdateDefines).concat(enableUnitTestsDefines)
 
     Properties {
diff --git a/tests/auto/api/api.qbs b/tests/auto/api/api.qbs
index 887bb999a..09e0af7dc 100644
--- a/tests/auto/api/api.qbs
+++ b/tests/auto/api/api.qbs
@@ -1,14 +1,14 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "api"
     files: ["../shared.h", "tst_api.h", "tst_api.cpp"]
-    // TODO: Use Utilities.cStringQuote
     cpp.defines: base.concat([
-        'SRCDIR="' + path + '"',
-        'QBS_RELATIVE_LIBEXEC_PATH="' + qbsbuildconfig.relativeLibexecPath + '"',
-        'QBS_RELATIVE_SEARCH_PATH="' + qbsbuildconfig.relativeSearchPath + '"',
-        'QBS_RELATIVE_PLUGINS_PATH="' + qbsbuildconfig.relativePluginsPath + '"'
+        "SRCDIR=" + Utilities.cStringQuote(path),
+        "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
+        "QBS_RELATIVE_SEARCH_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeSearchPath),
+        "QBS_RELATIVE_PLUGINS_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativePluginsPath)
     ]).concat(qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [])
 
     Group {
diff --git a/tests/auto/blackbox/blackbox-android.qbs b/tests/auto/blackbox/blackbox-android.qbs
index 4579ec862..068322cf9 100644
--- a/tests/auto/blackbox/blackbox-android.qbs
+++ b/tests/auto/blackbox/blackbox-android.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox-android"
@@ -17,6 +18,5 @@ QbsAutotest {
         "tst_blackboxandroid.cpp",
         "tst_blackboxandroid.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/blackbox/blackbox-apple.qbs b/tests/auto/blackbox/blackbox-apple.qbs
index 34b7e372d..8137aec82 100644
--- a/tests/auto/blackbox/blackbox-apple.qbs
+++ b/tests/auto/blackbox/blackbox-apple.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox-apple"
@@ -18,6 +19,5 @@ QbsAutotest {
         "tst_blackboxbase.cpp",
         "tst_blackboxbase.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/blackbox/blackbox-clangdb.qbs b/tests/auto/blackbox/blackbox-clangdb.qbs
index b77c08d5e..359fad1db 100644
--- a/tests/auto/blackbox/blackbox-clangdb.qbs
+++ b/tests/auto/blackbox/blackbox-clangdb.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox-clangdb"
@@ -20,6 +21,5 @@ QbsAutotest {
         "tst_clangdb.cpp",
         "tst_clangdb.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/blackbox/blackbox-java.qbs b/tests/auto/blackbox/blackbox-java.qbs
index d8664a9bf..b75a5f168 100644
--- a/tests/auto/blackbox/blackbox-java.qbs
+++ b/tests/auto/blackbox/blackbox-java.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox-java"
@@ -17,6 +18,5 @@ QbsAutotest {
         "tst_blackboxjava.cpp",
         "tst_blackboxjava.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/blackbox/blackbox-qt.qbs b/tests/auto/blackbox/blackbox-qt.qbs
index f8a2f0ec4..ad473f731 100644
--- a/tests/auto/blackbox/blackbox-qt.qbs
+++ b/tests/auto/blackbox/blackbox-qt.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox-qt"
@@ -17,6 +18,5 @@ QbsAutotest {
         "tst_blackboxqt.cpp",
         "tst_blackboxqt.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/blackbox/blackbox.qbs b/tests/auto/blackbox/blackbox.qbs
index c0fcbd471..55c116480 100644
--- a/tests/auto/blackbox/blackbox.qbs
+++ b/tests/auto/blackbox/blackbox.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     testName: "blackbox"
@@ -23,6 +24,5 @@ QbsAutotest {
         "tst_blackbox.cpp",
         "tst_blackbox.h",
     ]
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: base.concat(['SRCDIR="' + path + '"'])
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
 }
diff --git a/tests/auto/cmdlineparser/cmdlineparser.qbs b/tests/auto/cmdlineparser/cmdlineparser.qbs
index 717814661..a45e61f5d 100644
--- a/tests/auto/cmdlineparser/cmdlineparser.qbs
+++ b/tests/auto/cmdlineparser/cmdlineparser.qbs
@@ -1,13 +1,13 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     Depends { name: "qbsversion" }
     testName: "cmdlineparser"
     files: ["tst_cmdlineparser.cpp", "../../../src/app/qbs/qbstool.cpp"]
-    // TODO: Use Utilities.cStringQuote
     cpp.defines: base.concat([
-        'SRCDIR="' + path + '"',
-        "QBS_VERSION=\"" + qbsversion.version + "\""
+        "SRCDIR=" + Utilities.cStringQuote(path),
+        "QBS_VERSION=" +Utilities.cStringQuote(qbsversion.version)
     ])
 
     // TODO: Make parser a static library?
diff --git a/tests/auto/language/language.qbs b/tests/auto/language/language.qbs
index 27f390e94..9610b1fe1 100644
--- a/tests/auto/language/language.qbs
+++ b/tests/auto/language/language.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     Depends { name: "qbsversion" }
@@ -11,10 +12,9 @@ QbsAutotest {
         "tst_language.h"
     ]
 
-    // TODO: Use Utilities.cStringQuote
     cpp.defines: base.concat([
-        'QBS_VERSION="' + qbsversion.version + '"',
-        "SRCDIR=\"" + path + "\""
+        "QBS_VERSION=" + Utilities.cStringQuote(qbsversion.version),
+        "SRCDIR=" + Utilities.cStringQuote(path)
     ])
 
     Group {
diff --git a/tests/auto/tools/tools.qbs b/tests/auto/tools/tools.qbs
index c626c7704..bdf597b7e 100644
--- a/tests/auto/tools/tools.qbs
+++ b/tests/auto/tools/tools.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.Utilities
 
 QbsAutotest {
     Depends { name: "qbsversion" }
@@ -10,6 +11,5 @@ QbsAutotest {
         "tst_tools.h"
     ]
 
-    // TODO: Use Utilities.cStringQuote
-    cpp.defines: ['QBS_VERSION="' + qbsversion.version + '"']
+    cpp.defines: ["QBS_VERSION=" + Utilities.cStringQuote(qbsversion.version)]
 }