From e7b61cb485d9269b248bb031abab22fdfb23ed89 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Sat, 10 Oct 2015 13:43:01 +0100
Subject: Remove the exec of hg which does funny things in your QT project
 window if you aren't using mercurial

---
 src/organizer.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/organizer.pro b/src/organizer.pro
index 808fdeb5..5b2c56b1 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -310,7 +310,7 @@ 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)
+HGID = 'nothing'
 DEFINES += HGID=\\\"$${HGID}\\\"
 
 CONFIG(debug, debug|release) {
-- 
cgit v1.3.1


From 939993aefe4b0e2928835d2594713e96383c38ce Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Sun, 11 Oct 2015 21:28:38 +0100
Subject: Bring scons build up to date with cmake build

---
 src/SConscript | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/SConscript b/src/SConscript
index 6783fd8b..2beec1ae 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -47,9 +47,6 @@ env.AppendUnique(LIBS = [
 other_sources = env.AddExtraMoc(env.Glob('*.h'))
 
 for file in env.Glob('*.rc'):
-    # version.rc is included in app_icon.rc. Not sure why it's a separate file.
-    if file.name == 'version.rc':
-        continue
     other_sources.append(env.RES(file))
 
 # Note the order of this is important, or you can pick up the wrong report.h...
-- 
cgit v1.3.1