beautify string template syntax

Instead of the less common syntax
    ###some key value
it's
    @some_key_value@
now.

Change-Id: Ic3b763b5d0828aaa22af6f05b55e8ede80fb47f9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index fe00e263f..09ecb1f02 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -150,10 +150,10 @@ static void replaceSpecialValues(const QString &filePath, const Profile &profile
                 .arg(profile.name(), moduleFile.fileName(), moduleFile.errorString()));
     }
     QByteArray content = moduleFile.readAll();
-    content.replace("### name", utf8JSLiteral(qtModuleName(module)));
-    content.replace("### has library", utf8JSLiteral(module.hasLibrary));
-    content.replace("### dependencies", utf8JSLiteral(module.dependencies));
-    content.replace("### includes", utf8JSLiteral(module.includePaths));
+    content.replace("@name@", utf8JSLiteral(qtModuleName(module)));
+    content.replace("@has_library@", utf8JSLiteral(module.hasLibrary));
+    content.replace("@dependencies@", utf8JSLiteral(module.dependencies));
+    content.replace("@includes@", utf8JSLiteral(module.includePaths));
     QByteArray propertiesString;
     if (module.qbsName == QLatin1String("declarative")
             || module.qbsName == QLatin1String("quick")) {
@@ -186,7 +186,7 @@ static void replaceSpecialValues(const QString &filePath, const Profile &profile
             propertiesString += "\n    ";
         propertiesString += "isStaticLibrary: true";
     }
-    content.replace("### special properties", propertiesString);
+    content.replace("@special_properties@", propertiesString);
     moduleFile.resize(0);
     moduleFile.write(content);
 }
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index afb63e4df..13f3ed554 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -56,7 +56,7 @@ Module {
         return defines;
     }
     cpp.includePaths: {
-        var paths = ### includes;
+        var paths = @includes@;
         paths.push(mkspecPath, generatedFilesDir);
         return paths;
     }
diff --git a/src/lib/qtprofilesetup/templates/gui.qbs b/src/lib/qtprofilesetup/templates/gui.qbs
index 580fc4d52..366b0250c 100644
--- a/src/lib/qtprofilesetup/templates/gui.qbs
+++ b/src/lib/qtprofilesetup/templates/gui.qbs
@@ -32,7 +32,7 @@ QtModule {
         }
     }
 
-    cpp.includePaths: ### includes
+    cpp.includePaths: @includes@
 
     Properties {
         condition: Qt.core.staticBuild && qbs.targetOS.contains("ios")
diff --git a/src/lib/qtprofilesetup/templates/module.qbs b/src/lib/qtprofilesetup/templates/module.qbs
index 800c1c9cc..24fb359d4 100644
--- a/src/lib/qtprofilesetup/templates/module.qbs
+++ b/src/lib/qtprofilesetup/templates/module.qbs
@@ -2,9 +2,9 @@ import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
-    qtModuleName: ### name
-    Depends { name: "Qt"; submodules: ### dependencies }
-    hasLibrary: ### has library
-    cpp.includePaths: ### includes
-    ### special properties
+    qtModuleName: @name@
+    Depends { name: "Qt"; submodules: @dependencies@}
+    hasLibrary: @has_library@
+    cpp.includePaths: @includes@
+    @special_properties@
 }
diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs
index 2ca84f4df..40bb534e8 100644
--- a/src/lib/qtprofilesetup/templates/phonon.qbs
+++ b/src/lib/qtprofilesetup/templates/phonon.qbs
@@ -5,5 +5,5 @@ QtModule {
     qtModuleName: "phonon"
     Depends { name: "Qt"; submodules: ['core'] }
     qtModulePrefix: ''
-    cpp.includePaths: ### includes
+    cpp.includePaths: @includes@
 }