diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:22 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:30 +0200 |
| commit | 2af57eb8c8351e09f3224128b3593aa160c6c424 (patch) | |
| tree | 410ee4a7da7485937f21fd2d11e0cb12cdfb61f8 /installerfw.pri | |
| parent | 8bf239c376285f9f5254d78ad263d46ceb944a33 (diff) | |
| parent | 0a54640535049bf5124a7b4414bb75a8b2075087 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
installerfw.pri
src/libs/kdtools/kdgenericfactory.cpp
src/libs/kdtools/kdgenericfactory.h
src/libs/kdtools/kdupdaterapplication.cpp
src/libs/kdtools/kdupdaterapplication.h
src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
src/libs/kdtools/kdupdaterupdatesourcesinfo.h
sync.profile
Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/installerfw.pri b/installerfw.pri index a0506715e..fc5a63804 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -111,7 +111,15 @@ CONFIG(static, static|shared) { } CONFIG += depend_includepath no_private_qt_headers_warning c++11 -GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) +exists(".git") { + GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) +} + +isEmpty(GIT_SHA1) { + # Attempt to read the sha1 from alternative location + GIT_SHA1=\"$$cat(.tag)\" +} + DEFINES += QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER "_GIT_SHA1_=$$GIT_SHA1" \ IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION |