From 186b4277509e2d07a6b3a1aa71a02a3f30bd0f62 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 26 Jun 2014 20:50:37 +0300 Subject: [PATCH] Try avoid redefining LOC_REV. --HG-- branch : develop --- src/app/app.pro | 11 +++++------ src/libs/qmuparser/qmuparser.pro | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/app.pro b/src/app/app.pro index b90f0d086..0a5375203 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -551,14 +551,13 @@ CONFIG(debug, debug|release){ } DEFINES += QT_NO_DEBUG_OUTPUT + #local revision number for using in version - !system(hg) { - DEFINES += "LOC_REV=0" - } - else - { - DEFINES += LOC_REV=$$system(hg parents --template '{rev}') + HG_REV=$$system(hg parents --template '{rev}') + isEmpty(HG_REV){ + HG_REV = 0 } + DEFINES += "LOC_REV=$${HG_REV}" } message(Qt version: $$[QT_VERSION]) diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 8edf4c2e5..8b6cc75f7 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -490,4 +490,3 @@ QMAKE_DISTCLEAN += \ $${DESTDIR}/* \ $${OBJECTS_DIR}/* \ $${MOC_DIR}/* -