Commit cca4cbfb authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

remove more pointless indirections

Change-Id: I2f16b93261aa5cefe34f76c99db64511c7dcae4a
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 3f843aca
...@@ -5,10 +5,6 @@ Module { ...@@ -5,10 +5,6 @@ Module {
Depends { id: qtcore; name: "Qt.core" } Depends { id: qtcore; name: "Qt.core" }
additionalProductFileTags: qtcore.versionMajor < 5 ? ["pluginSpec"] : ["qt_plugin_metadata"] additionalProductFileTags: qtcore.versionMajor < 5 ? ["pluginSpec"] : ["qt_plugin_metadata"]
property int ide_version_major: project.ide_version_major
property int ide_version_minor: project.ide_version_minor
property int ide_version_release: project.ide_version_release
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
Rule { Rule {
inputs: ["pluginSpecIn"] inputs: ["pluginSpecIn"]
...@@ -22,10 +18,10 @@ Module { ...@@ -22,10 +18,10 @@ Module {
var cmd = new JavaScriptCommand(); var cmd = new JavaScriptCommand();
cmd.description = "prepare " + FileInfo.fileName(output.fileName); cmd.description = "prepare " + FileInfo.fileName(output.fileName);
cmd.highlight = "codegen"; cmd.highlight = "codegen";
cmd.qtcreator_version = product.moduleProperty("pluginspec", "qtcreator_version"); cmd.ide_version_major = project.ide_version_major;
cmd.ide_version_major = product.moduleProperty("pluginspec", "ide_version_major"); cmd.ide_version_minor = project.ide_version_minor;
cmd.ide_version_minor = product.moduleProperty("pluginspec", "ide_version_minor"); cmd.ide_version_release = project.ide_version_release;
cmd.ide_version_release = product.moduleProperty("pluginspec", "ide_version_release"); cmd.qtcreator_version = cmd.ide_version_major + '.' + cmd.ide_version_minor + '.' + cmd.ide_version_release;
cmd.pluginspecreplacements = product.pluginspecreplacements; cmd.pluginspecreplacements = product.pluginspecreplacements;
cmd.plugin_depends = []; cmd.plugin_depends = [];
......
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