chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Project file GIT stuff

Browse Source
This commit is contained in:
Mark Watkins 2013-10-18 15:09:52 +10:00
parent 3c2ae16976
commit 89f2fb2a51
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/mainwindow.cpp
View File

@ -592,7 +592,7 @@ void MainWindow::on_action_About_triggered()
{ {
QString gitrev=QString(GIT_REVISION); QString gitrev=QString(GIT_REVISION);
if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev+" ("+QString(GIT_BRANCH)+" branch)";
// "<style type=\"text/css\">body { margin:0; padding:0; } html, body, #bg { height:100%; width:100% } #bg { position: absolute; left:0; right:0; bottom:0; top:0; overflow:hidden; z-index:1; } #bg img { width:100%; min-width:100%; min-height:100%; } #content { z-index:0; }</style><body><div id=\"bg\"> <img style=\"display:block;\" src=\"qrc:/icons/Bob Strikes Back.png\"></div><div id=\"content\">" // "<style type=\"text/css\">body { margin:0; padding:0; } html, body, #bg { height:100%; width:100% } #bg { position: absolute; left:0; right:0; bottom:0; top:0; overflow:hidden; z-index:1; } #bg img { width:100%; min-width:100%; min-height:100%; } #content { z-index:0; }</style><body><div id=\"bg\"> <img style=\"display:block;\" src=\"qrc:/icons/Bob Strikes Back.png\"></div><div id=\"content\">"
QString msg=QString( QString msg=QString(

4
sleepyhead/sleepyhead.pro
View File

@ -41,9 +41,9 @@ exists(../.git):{
DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\" DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\"
DEFINES += GIT_REVISION=\\\"$$system(git rev-parse 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_BRANCH=\\\"UNKNOWN\\\"
DEFINES += GIT_REVISION=\\\"UNKNOWN\\\" DEFINES += GIT_REVISION=\\\"UNKNOWN\\\"
} }