From 5b6f4a48211048e426c03d88068c32c4fcf7c57e Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 10 Oct 2013 09:10:38 +0200 Subject: [PATCH] fixed the build of UBVERSION --- OpenBoard.pro | 2 +- src/core/UBApplication.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index c3101ebc..74464112 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -10,7 +10,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 VERSION_MIN = 00 -VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error +VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_PATCH = 02 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index d4fc3fb5..b6b8b06b 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -124,7 +124,10 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing setOrganizationDomain("oe-f.org"); setApplicationName("OpenBoard"); - setApplicationVersion(UBVERSION); + QString version = UBVERSION; + if(version.endsWith(".")) + version = version.left(version.length()-1); + setApplicationVersion(version); #if defined(Q_WS_MAC) && !defined(QT_NO_DEBUG) CFStringRef shortVersion = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("CFBundleShortVersionString"));