@@ -105,15 +105,12 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
{
QCoreApplication::setOrganizationDomain(QLatin1String("arora-browser.org"));
QCoreApplication::setApplicationName(QLatin1String("Arora"));
- QString version = QLatin1String("0.10.1");
- QString gitVersion = QLatin1String(GITCHANGENUMBER);
- if (gitVersion != QLatin1String("0")
- && !gitVersion.isEmpty())
- version += QString(QLatin1String(" (Git: %1 %2)"))
- .arg(QLatin1String(GITCHANGENUMBER))
- .arg(QLatin1String(GITVERSION));
-
- QCoreApplication::setApplicationVersion(version);
+ QCoreApplication::setApplicationVersion(QLatin1String("0.10.1"
+#ifdef GITVERSION
+ " (Git: " GITCHANGENUMBER " " GITVERSION ")"
+#endif
+ ));
+
#ifndef AUTOTESTS
connect(this, SIGNAL(messageReceived(QLocalSocket *)),
this, SLOT(messageReceived(QLocalSocket *)));
src/browserapplication.cpp
@@ -15,19 +15,12 @@ UI_DIR = $$PWD/.ui
MOC_DIR = $$PWD/.moc
OBJECTS_DIR = $$PWD/.obj
-
-win32 {
- DEFINES += GITVERSION=0
- DEFINES += GITCHANGENUMBER=0
-} else {
- exists($$PWD/../.git/HEAD) {
- GITVERSION=$$system(git log -n1 --pretty=format:%h)
- DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
+exists(../.git/HEAD) {
+ GITVERSION=$$system(git log -n1 --pretty=format:%h)
+ !isEmpty(GITVERSION) {
GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
+ DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
- } else {
- DEFINES += GITVERSION=\"\\\"0\\\"\"
- DEFINES += GITCHANGENUMBER=\"\\\"0\\\"\"
}
}
src/src.pri
d9b3bb98fdbf0cb279cdecf604ff87f163fc36a7
Christopher Eby
kreed@kreed.org
http://github.com/icefox/arora/commit/e553195e165fb6def0a8381a44e760e3f94cb614
e553195e165fb6def0a8381a44e760e3f94cb614
2009-10-15T19:10:46-07:00
2009-10-10T13:58:32-07:00
Simplify setting of applicationVersion
This avoids compile errors when GITVERSION is undefined and does the
work at build-time rather than run-time.
07957788dcff4a1cbbad3044589a70dc95828535
Benjamin C Meyer
ben@meyerhome.net