diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-03-02 15:55:29 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-02 15:55:29 +0100 |
commit | 994a68280e86f51f0222bb47eaf18b3a82ecc1e8 (patch) | |
tree | e4e5a5a76ec8cd016fdc958fa696cf8c92fa884a /qbs/modules | |
parent | fec6bb6c2fb315a859a676ea12f65cf14d29a201 (diff) | |
parent | 8673aae986a3028f5f9dacd15dd77f0d35d2c281 (diff) |
Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: Iaf254ce5bc895c703aa6772b4aaa139e531696f6
Diffstat (limited to 'qbs/modules')
-rw-r--r-- | qbs/modules/pluginjson/pluginjson.qbs | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index 03bdb0b076..8cba183437 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -1,11 +1,37 @@ import qbs 1.0 -import qbs.TextFile +import qbs.File import qbs.FileInfo +import qbs.TextFile +import qbs.Utilities Module { Depends { id: qtcore; name: "Qt.core" } Depends { name: "qtc" } + // TODO: Wrap the VCS specific stuff in a dedicated module + property bool hasVcs: Utilities.versionCompare(qbs.version, "1.10") >= 0 + Depends { name: "vcs"; condition: hasVcs } + Properties { + condition: hasVcs + vcs.repoDir: { + // TODO: Could something like this be incorporated into the vcs module? + // Currently, the default repo dir is project.sourceDirectory, which + // does not make sense for Qt Creator. + var dir = sourceDirectory; + while (true) { + if (File.exists(FileInfo.joinPaths(dir, ".git"))) + return dir; + var newDir = FileInfo.path(dir); + if (newDir === dir || dir === project.sourceDirectory) { + console.warn("No git repository found for product " + product.name + + ", revision information will not be evailable."); + break; + } + dir = newDir; + } + } + } + additionalProductTypes: ["qt_plugin_metadata"] Rule { @@ -56,6 +82,8 @@ Module { vars['IDE_VERSION_RELEASE'] = product.moduleProperty("qtc", "ide_version_release"); vars['QTCREATOR_COPYRIGHT_YEAR'] = product.moduleProperty("qtc", "qtcreator_copyright_year") + if (!vars['QTC_PLUGIN_REVISION']) + vars['QTC_PLUGIN_REVISION'] = product.vcs ? (product.vcs.repoState || "") : ""; var deplist = []; for (i in plugin_depends) { deplist.push(" { \"Name\" : \"" + plugin_depends[i] + "\", \"Version\" : \"" + qtcVersion + "\" }"); |