From 89f2fb2a514a3b9c81e83ee8b8ffdca460cd7f82 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 18 Oct 2013 15:09:52 +1000 Subject: [PATCH] Project file GIT stuff --- sleepyhead/mainwindow.cpp | 2 +- sleepyhead/sleepyhead.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index f869ad1b..cdbd40bf 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -592,7 +592,7 @@ void MainWindow::on_action_About_triggered() { QString gitrev=QString(GIT_REVISION); - if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; + if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev+" ("+QString(GIT_BRANCH)+" branch)"; // "
" QString msg=QString( diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index f6d4295b..7a8b1f3b 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -41,9 +41,9 @@ exists(../.git):{ DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\" DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\" - equals(GIT_BRANCH,"unstable"):DEFINES += UNSTABLE_BUILD + equals($$system(git rev-parse --abbrev-ref HEAD),"unstable"):DEFINES += UNSTABLE_BUILD -}else{ +} else { DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\" DEFINES += GIT_REVISION=\\\"UNKNOWN\\\" }