diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-05-10 13:23:48 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-05-14 16:23:38 +0200 |
| commit | f767708b38d02cc5341f0ce606098b036462e021 (patch) | |
| tree | 12fea34c0f4c696c0f899ad78578c3535db2c80f | |
| parent | d4988a30fc6fc67603ac110bfac2151afe5890fe (diff) | |
print the qbs version in the help output
The version string is now available as QBS_VERSION define.
It's defined in qbs_version.pri.
Change-Id: I09924334f182ee2349fe1b823d07d38089b84e04
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qbs.pro | 2 | ||||
| -rw-r--r-- | qbs_version.pri | 2 | ||||
| -rw-r--r-- | src/lib/lib.pro | 1 | ||||
| -rw-r--r-- | src/lib/tools/options.cpp | 1 |
4 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,3 @@ -QBS_VERSION = 0.2.0 TEMPLATE = subdirs CONFIG += ordered lib.file = src/lib/lib.pro @@ -14,4 +13,5 @@ SUBDIRS += \ OTHER_FILES += \ doc/qbs.qdoc +include(qbs_version.pri) include(doc/doc.pri) diff --git a/qbs_version.pri b/qbs_version.pri new file mode 100644 index 000000000..1cfaaf40a --- /dev/null +++ b/qbs_version.pri @@ -0,0 +1,2 @@ +QBS_VERSION = 0.2.0 +DEFINES += QBS_VERSION=\\\"$$QBS_VERSION\\\" diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 4542cb454..d2495f1e0 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -9,6 +9,7 @@ DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB # needed for QmlJS win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d +include(../../qbs_version.pri) include(jsextensions/jsextensions.pri) include(tools/tools.pri) include(parser/parser.pri) diff --git a/src/lib/tools/options.cpp b/src/lib/tools/options.cpp index dd210bf1f..8d75b9b81 100644 --- a/src/lib/tools/options.cpp +++ b/src/lib/tools/options.cpp @@ -66,6 +66,7 @@ CommandLineOptions::CommandLineOptions() void CommandLineOptions::printHelp() { + puts("qbs " QBS_VERSION "\n"); fputs("usage: qbs [command] [options]\n" "\ncommands:\n" " build [variant] [property:value]\n" |