diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 9e7861f0169..4ff2d018884 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -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", diff --git a/qtcreator.qbs b/qtcreator.qbs index fb9dd1074e4..b3356c921ec 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -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();