Merge branch '1.1' into 'master'.

Change-Id: Ia6cb10047d02ebe2752984f57e8b729be9d6552e

2 files changed, 4 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 4b6ec8870..e6841e499 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -185,7 +185,7 @@ Module {
 
     FileTagger {
         pattern: "*.C"
-        fileTags: ["c"]
+        fileTags: ["cpp"]
     }
 
     FileTagger {
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index d07c6e69d..6186d90eb 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -148,6 +148,9 @@ CppModule {
                 for (var i = 0; i < symlinkCount; ++i) {
                     cmd = new Command("ln", ["-sf", FileInfo.fileName(libFilePath),
                                                     links[i].fileName]);
+                    cmd.description = "filegen";
+                    cmd.description = "creating symbolic link '"
+                            + FileInfo.fileName(links[i].fileName) + "'";
                     cmd.workingDirectory = FileInfo.path(libFilePath);
                     commands.push(cmd);
                 }