diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-18 15:18:34 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-18 15:18:34 +0200 |
commit | d77883c16a5327bd21a77f1e22f132c890ab4787 (patch) | |
tree | ebec85ff9f1d91e01464c24e2cff6ce384674042 /qbs | |
parent | 72e0ded3c4882868a0030300f32c18f8671b4d39 (diff) | |
parent | 7dc52d1a5497c29757e833914a90dfa25645a0cc (diff) |
Merge remote-tracking branch 'origin/2.7'
Diffstat (limited to 'qbs')
-rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 3a6297f777..2922ce40ea 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -81,7 +81,7 @@ Module { Artifact { fileTags: ["qt_plugin_metadata"] fileName: { - var destdir = FileInfo.joinPaths(product.moduleProperty("qt/core", "generatedFilesDir"), + var destdir = FileInfo.joinPaths(product.moduleProperty("Qt/core", "generatedFilesDir"), input.fileName); return destdir.replace(/\.[^\.]*$/, '.json'); } @@ -89,7 +89,7 @@ Module { prepare: { var xslFile = project.path + "/src/pluginjsonmetadata.xsl"; - var xmlPatternsPath = product.moduleProperty("qt/core", "binPath") + "/xmlpatterns"; + var xmlPatternsPath = product.moduleProperty("Qt/core", "binPath") + "/xmlpatterns"; var args = [ "-no-format", "-output", |