Commit 5b6f4a48 authored by Claudio Valerio's avatar Claudio Valerio

fixed the build of UBVERSION

parent 34b30119
...@@ -10,7 +10,7 @@ CONFIG += debug_and_release \ ...@@ -10,7 +10,7 @@ CONFIG += debug_and_release \
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 00 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_PATCH = 02
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
......
...@@ -124,7 +124,10 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing ...@@ -124,7 +124,10 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
setOrganizationDomain("oe-f.org"); setOrganizationDomain("oe-f.org");
setApplicationName("OpenBoard"); 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) #if defined(Q_WS_MAC) && !defined(QT_NO_DEBUG)
CFStringRef shortVersion = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("CFBundleShortVersionString")); CFStringRef shortVersion = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("CFBundleShortVersionString"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment