diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-06 12:14:06 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-06 12:16:37 +0100 |
| commit | 2d80d68db948bea027a6e0d9a9e289f112c5dd6e (patch) | |
| tree | 816aa3e9bcfba960265938ff2ba2584c6e4b8131 /share/qbs | |
| parent | 896b90a06a692702e7e5c5da148bdac835c97b6d (diff) | |
| parent | db11fbfc994272c965f62effeb5b464741234ab6 (diff) | |
| download | qbs-2d80d68db948bea027a6e0d9a9e289f112c5dd6e.tar.gz | |
Merge branch '1.1' into 'master'.
Change-Id: Ia6cb10047d02ebe2752984f57e8b729be9d6552e
Diffstat (limited to 'share/qbs')
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 3 |
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); } |