diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-30 18:03:13 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-02 19:41:38 +0000 |
| commit | b3e8a5c5f8dd7be8abe3a1543cfa818f6f2eee3b (patch) | |
| tree | b26358a50ac250d34a8f5e965fc7c62a34093411 /dist | |
| parent | 11a08386295c1b9c9abb71899421274daea07d2c (diff) | |
Introduce the qbsversion module for building Qbs
Use that instead of QbsFunctions.qbsVersion() and read it in
qbs_version.pri; this has the advantage that simple text processing
tools can retrieve the project version without having to parse
JavaScript. It's also set from only one place now.
Change-Id: Icfd2a6bf12b794b55c9ba31934a96b4483224eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/dist.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/dist.qbs b/dist/dist.qbs index a5ba27308..51b55bd4d 100644 --- a/dist/dist.qbs +++ b/dist/dist.qbs @@ -3,7 +3,6 @@ import qbs.FileInfo import qbs.ModUtils import qbs.Process import qbs.TextFile -import QbsFunctions Product { Depends { name: "qbs-config" } @@ -14,6 +13,7 @@ Product { Depends { name: "qbs-setup-toolchains" } Depends { name: "qbs_app" } Depends { name: "qbs_processlauncher" } + Depends { name: "qbsversion" } Depends { name: "qbscore" } Depends { name: "qbsqtprofilesetup" } Depends { name: "qbs_cpp_scanner" } @@ -50,7 +50,7 @@ Product { condition: qbs.targetOS.contains("windows") builtByDefault: false type: ["archiver.archive"] - targetName: "qbs-windows-" + qbs.architecture + "-" + QbsFunctions.qbsVersion() + targetName: "qbs-windows-" + qbs.architecture + "-" + qbsversion.version destinationDirectory: project.buildDirectory archiver.type: "zip" |