summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-10-17 15:37:08 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-10-22 11:54:37 +0200
commit16f8c24519dd3b3fc278df903e1ae7fefe4ff5cb (patch)
treec1d1f302a8aab154303fbccaaf0691a97815d760
parentfc5aa84857fc71ffcc888613cdc53b347c00b2a6 (diff)
downloadqbs-16f8c24519dd3b3fc278df903e1ae7fefe4ff5cb.tar.gz
Give the qbs library a version.
Currently, the project version has no effect on the library name on Unix systems. Change-Id: I7a76a0d127fc47170cf05c888cc3ee92e5c44395 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/lib/lib.pro2
-rw-r--r--src/lib/lib.qbs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 394d50fe7..e1ac1c256 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -30,6 +30,8 @@ else:*g++*|*clang*|*icc*:QMAKE_CXXFLAGS += -Werror
}
include(../../qbs_version.pri)
+VERSION = $${QBS_VERSION}
+
include(api/api.pri)
include(buildgraph/buildgraph.pri)
include(jsextensions/jsextensions.pri)
diff --git a/src/lib/lib.qbs b/src/lib/lib.qbs
index 510b824d1..5c38cef71 100644
--- a/src/lib/lib.qbs
+++ b/src/lib/lib.qbs
@@ -6,6 +6,7 @@ Product {
Depends { name: "Qt"; submodules: ["core", "script", "xml"] }
Depends { condition: project.enableUnitTests; name: "Qt.test" }
name: "qbscore"
+ version: Version.qbsVersion()
type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary"
targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name
destinationDirectory: qbs.targetOS.contains("windows") ? "bin" : "lib"