aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-06-12 00:55:08 -0700
committerJake Petroules <jake.petroules@petroules.com>2015-06-12 08:27:30 +0000
commit9f42afec1247698886308eef9128ad4f67ef105c (patch)
tree37379952ff6cb365eb64ec2fb710f231ad9b7728
parent313987ae3b32ac085db3f6f114923c543eb87394 (diff)
Use product.targetName as the default value of archiver.archiveBaseName.
This keeps the file naming indirection consistent with other modules. Change-Id: Ia42c5b3c6ce97854e1828ed9bc14e012f7e7db0e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--doc/reference/modules/archiver-module.qdoc2
-rw-r--r--share/qbs/modules/archiver/archiver.qbs2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/modules/archiver-module.qdoc b/doc/reference/modules/archiver-module.qdoc
index 589676586..62c6a9684 100644
--- a/doc/reference/modules/archiver-module.qdoc
+++ b/doc/reference/modules/archiver-module.qdoc
@@ -58,7 +58,7 @@
\row
\li archiveBaseName
\li string
- \li \c{product.name}
+ \li \c{product.targetName}
\li The base name of the archive file (in other words, the file name without
any extensions).
\row
diff --git a/share/qbs/modules/archiver/archiver.qbs b/share/qbs/modules/archiver/archiver.qbs
index 874e2194b..1d66df855 100644
--- a/share/qbs/modules/archiver/archiver.qbs
+++ b/share/qbs/modules/archiver/archiver.qbs
@@ -34,7 +34,7 @@ import qbs.FileInfo
Module {
property string type
- property string archiveBaseName: product.name
+ property string archiveBaseName: product.targetName
property string workingDirectory
property stringList flags: []
property path outputDirectory: product.destinationDirectory