diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:49 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:49 +0100 |
| commit | ca6d7c7d11d5ecc62c8b7a825ff6b1c8bb77b75b (patch) | |
| tree | 05652a6e1d0c45afd3bd05cae631ca68859d1bfa /src | |
| parent | 077a58f410b4d4ef32f7a9ebc0821f08c3cec6eb (diff) | |
| parent | 939993aefe4b0e2928835d2594713e96383c38ce (diff) | |
Merge branch 'master' into archive_cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/SConscript | 3 | ||||
| -rw-r--r-- | src/organizer.pro | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/SConscript b/src/SConscript index 540b2343..aa408af7 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...
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) {
|