Commit 03018696 authored by Christian Kandeler's avatar Christian Kandeler

Adapt qbs files to new module property access syntax.

Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 5cf11e2b
......@@ -23,12 +23,12 @@ Module {
var cmd = new JavaScriptCommand();
cmd.description = "prepare " + FileInfo.fileName(output.fileName);
cmd.highlight = "codegen";
cmd.qtcreator_version = product.module.qtcreator_version;
cmd.ide_version_major = product.module.ide_version_major;
cmd.ide_version_minor = product.module.ide_version_minor;
cmd.ide_version_release = product.module.ide_version_release;
cmd.qtcreator_version = product.moduleProperty("pluginspec", "qtcreator_version");
cmd.ide_version_major = product.moduleProperty("pluginspec", "ide_version_major");
cmd.ide_version_minor = product.moduleProperty("pluginspec", "ide_version_minor");
cmd.ide_version_release = product.moduleProperty("pluginspec", "ide_version_release");
cmd.pluginspecreplacements = product.module.pluginspecreplacements;
cmd.pluginspecreplacements = product.moduleProperty("pluginspec", "pluginspecreplacements");
cmd.sourceCode = function() {
var i;
......@@ -60,7 +60,7 @@ Module {
Artifact {
fileTags: ["qt_plugin_metadata"]
fileName: {
var destdir = FileInfo.joinPaths(product.modules["qt/core"].generatedFilesDir,
var destdir = FileInfo.joinPaths(product.moduleProperty("qt/core", "generatedFilesDir"),
input.fileName);
return destdir.replace(/\.[^\.]*$/, '.json');
}
......@@ -68,7 +68,7 @@ Module {
prepare: {
var xslFile = project.path + "/src/pluginjsonmetadata.xsl";
var xmlPatternsPath = product.modules["qt/core"].binPath + "/xmlpatterns";
var xmlPatternsPath = product.moduleProperty("qt/core", "binPath") + "/xmlpatterns";
var args = [
"-no-format",
"-output",
......
......@@ -109,7 +109,7 @@ Project {
cmd.ide_version_major = product.ide_version_major;
cmd.ide_version_minor = product.ide_version_minor;
cmd.ide_version_release = product.ide_version_release;
cmd.onWindows = (product.modules.qbs.targetOS == "windows");
cmd.onWindows = (product.moduleProperty("qbs", "targetOS") === "windows");
cmd.sourceCode = function() {
var file = new TextFile(input.fileName);
var content = file.readAll();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment