Use Rule.name in favor of id in toolchain rules

The ids are currently unused and so are the names.
But while the ids are of no value at all, the names can be useful for
debugging. Also, we might use them later as a way to identify rules /
groups of "similar" rules (e.g. linker rules).

Change-Id: I6dfac1db7c36a6cae52298ceb0691a106379ae3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 10 insertions, 10 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 792e8ef4c..321f3ac71 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -390,7 +390,7 @@ CppModule {
                                        || product.multiplexConfigurationId
 
     Rule {
-        id: dynamicLibraryLinker
+        name: "dynamicLibraryLinker"
         condition: product.cpp.shouldLink
         multiplex: true
         inputs: {
@@ -452,7 +452,7 @@ CppModule {
     }
 
     Rule {
-        id: staticLibraryLinker
+        name: "staticLibraryLinker"
         condition: product.cpp.shouldLink
         multiplex: true
         inputs: ["obj", "linkerscript"]
@@ -494,7 +494,7 @@ CppModule {
     }
 
     Rule {
-        id: loadableModuleLinker
+        name: "loadableModuleLinker"
         condition: product.cpp.shouldLink
         multiplex: true
         inputs: {
@@ -531,7 +531,7 @@ CppModule {
     }
 
     Rule {
-        id: applicationLinker
+        name: "applicationLinker"
         condition: product.cpp.shouldLink
         multiplex: true
         inputs: {
@@ -567,7 +567,7 @@ CppModule {
     }
 
     Rule {
-        id: compiler
+        name: "compiler"
         inputs: ["cpp", "c", "objcpp", "objc", "asm_cpp"]
         auxiliaryInputs: ["hpp"]
         explicitlyDependsOn: ["c_pch", "cpp_pch", "objc_pch", "objcpp_pch"]
@@ -592,7 +592,7 @@ CppModule {
     }
 
     Rule {
-        id: assembler
+        name: "assembler"
         inputs: ["asm"]
 
         Artifact {
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 3164e08b5..e86200ee3 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -170,7 +170,7 @@ CppModule {
     }
 
     Rule {
-        id: compiler
+        name: "compiler"
         inputs: ["cpp", "c"]
         auxiliaryInputs: ["hpp"]
         explicitlyDependsOn: ["c_pch", "cpp_pch"]
@@ -191,7 +191,7 @@ CppModule {
     }
 
     Rule {
-        id: applicationLinker
+        name: "applicationLinker"
         multiplex: true
         inputs: ['obj', 'native.pe.manifest']
         inputsFromDependencies: ['staticlibrary', 'dynamiclibrary_import', "debuginfo_app"]
@@ -221,7 +221,7 @@ CppModule {
     }
 
     Rule {
-        id: dynamicLibraryLinker
+        name: "dynamicLibraryLinker"
         multiplex: true
         inputs: ['obj', 'native.pe.manifest']
         inputsFromDependencies: ['staticlibrary', 'dynamiclibrary_import', "debuginfo_dll"]
@@ -256,7 +256,7 @@ CppModule {
     }
 
     Rule {
-        id: libtool
+        name: "libtool"
         multiplex: true
         inputs: ["obj"]
         inputsFromDependencies: ["staticlibrary", "dynamiclibrary_import"]