summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-22 21:30:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-22 21:30:21 (GMT)
commitb381d4fac4c4362ab534ab73875126cb5c6cd101 (patch)
tree984af532325b88d27342d2e77b9a470de4d7402c /Swift
parent280a613aef9b549cca41497c50e70052cebb4860 (diff)
parenta3c9486f2f593220f5a9d4c4e57ac2bc7aa5bbf9 (diff)
downloadswift-contrib-b381d4fac4c4362ab534ab73875126cb5c6cd101.zip
swift-contrib-b381d4fac4c4362ab534ab73875126cb5c6cd101.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed SCons not picking up the build version correctly in tarball build.
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index daaff63..58f2b99 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -134,7 +134,7 @@ sources = [
"qrc_Swift.cc",
]
-myenv["SWIFT_VERSION"] = Version.getBuildVersion("swift")
+myenv["SWIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")
if env["PLATFORM"] == "win32" :
res = myenv.RES("../resources/Windows/Swift.rc")