aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-07-12 10:52:25 +0200
committerEike Ziller <eike.ziller@qt.io>2017-07-12 10:52:25 +0200
commitd522ec373fd06a58d9b62c5eaa70b18627e0eb68 (patch)
tree6b21b3d3aa043a515cb52811ff0d76b229febd88 /qbs
parentd6b6a88753c695e76dd5c9eaf1a47c136c63ddae (diff)
parent5a1a20f2eebd5ebb30f529adcdc7b0320dfb295d (diff)
Merge remote-tracking branch 'origin/4.4'
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/pluginjson/pluginjson.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs
index d8fe40d40e..88d276f9dc 100644
--- a/qbs/modules/pluginjson/pluginjson.qbs
+++ b/qbs/modules/pluginjson/pluginjson.qbs
@@ -15,7 +15,7 @@ Module {
fileTags: ["qt_plugin_metadata"]
filePath: {
var destdir = FileInfo.joinPaths(product.moduleProperty("Qt.core",
- "generatedFilesDir"), input.fileName);
+ "generatedHeadersDir"), input.fileName);
return destdir.replace(/\.[^\.]*$/,'')
}
}