diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-08-30 01:03:20 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-08-30 01:24:11 +0300 |
| commit | 139792ee25ade50113c2c53110463dc222658178 (patch) | |
| tree | 911460153f39a55532089c5c9027abafd7625e9d /qbs | |
| parent | 5ad44318ebc18eb75c81c80de72bbfb4085bf4ba (diff) | |
| parent | a5625f2f9d4af14a4f0b8fe085092793d3abb053 (diff) | |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 2 | ||||
| -rw-r--r-- | qbs/modules/pluginjson/pluginjson.qbs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 17d43e4582..f72dd5b352 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -12,7 +12,7 @@ QtcProduct { property var pluginRecommends: [] property var pluginTestDepends: [] - property string minimumQtVersion: "5.6.0" + property string minimumQtVersion: "5.6.2" condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) targetName: QtcFunctions.qtLibraryName(qbs, name) diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index 88d276f9dc..03bdb0b076 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -54,6 +54,8 @@ Module { vars['IDE_VERSION_MAJOR'] = product.moduleProperty("qtc", "ide_version_major"); vars['IDE_VERSION_MINOR'] = product.moduleProperty("qtc", "ide_version_minor"); vars['IDE_VERSION_RELEASE'] = product.moduleProperty("qtc", "ide_version_release"); + vars['QTCREATOR_COPYRIGHT_YEAR'] + = product.moduleProperty("qtc", "qtcreator_copyright_year") var deplist = []; for (i in plugin_depends) { deplist.push(" { \"Name\" : \"" + plugin_depends[i] + "\", \"Version\" : \"" + qtcVersion + "\" }"); |