diff options
| author | Tannin <sherb@gmx.net> | 2015-11-17 19:10:15 +0100 |
|---|---|---|
| committer | Tannin <sherb@gmx.net> | 2015-11-17 19:12:53 +0100 |
| commit | 0bd38e3f67c39fb37f75f639b81b02c100ad3375 (patch) | |
| tree | 7360e10227abdebe280624266a0f7b295ca37ff8 /src/organizer.pro | |
| parent | 7f4f4cafea5a196ddf824adf7c4e65cec5d44d88 (diff) | |
| parent | 56ba058cd54d073280eb86978d178e45253e6e19 (diff) | |
Merge branch 'master' into new_vfs_library
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/organizer.pro')
| -rw-r--r-- | src/organizer.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/organizer.pro b/src/organizer.pro index 808fdeb5..261e3c1c 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -310,7 +310,9 @@ DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS NOMI DEFINES += BOOST_DISABLE_ASSERTS NDEBUG QT_MESSAGELOGCONTEXT
#DEFINES += QMLJSDEBUGGER
-HGID = $$system(hg id -i)
+# If we are running mercurial get the build ID from that. If we aren't, at least
+# don't generate a strange message whenever you open the project
+HGID = $$system(if exist $OUT_PWD\\..\\.hg (hg id -i) else (echo 'Unknown'))
DEFINES += HGID=\\\"$${HGID}\\\"
CONFIG(debug, debug|release) {
|