aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/templates
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-04-25 23:28:04 -0700
committerJake Petroules <jake.petroules@qt.io>2016-04-26 09:27:53 +0000
commitebd566c2015b9a65d14fa3c753dae79ee27c5313 (patch)
tree206e698631d6e5395c9b2d65a67d1db49aa5f3f3 /src/lib/qtprofilesetup/templates
parentfb4f7fce751665884dd60876c11091853960577c (diff)
Fix use of qdoc with unrecognized file types.
Also, improve the error message when this happens. Change-Id: If7a398e7dec83a8697e231df39392d6c2d904674 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/qtprofilesetup/templates')
-rw-r--r--src/lib/qtprofilesetup/templates/qdoc.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/templates/qdoc.js b/src/lib/qtprofilesetup/templates/qdoc.js
index 6c7230233..0e37e259e 100644
--- a/src/lib/qtprofilesetup/templates/qdoc.js
+++ b/src/lib/qtprofilesetup/templates/qdoc.js
@@ -43,8 +43,9 @@ function qdocArgs(product, input, outputDir) {
return args;
}
+var _qdocDefaultFileTag = "qdoc-output";
function qdocFileTaggers() {
- var t = "qdoc-output";
+ var t = _qdocDefaultFileTag;
return {
".qhp": [t, "qhp"],
".qhp.sha1": [t, "qhp-sha1"],
@@ -59,6 +60,7 @@ function outputArtifacts(product, input) {
var tracker = new ModUtils.BlackboxOutputArtifactTracker();
tracker.hostOS = product.moduleProperty("qbs", "hostOS");
tracker.shellPath = product.moduleProperty("qbs", "shellPath");
+ tracker.defaultFileTags = [_qdocDefaultFileTag];
tracker.fileTaggers = qdocFileTaggers();
tracker.command = FileInfo.joinPaths(ModUtils.moduleProperty(product, "binPath"),
ModUtils.moduleProperty(product, "qdocName"));