X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;fp=src%2Fcommon%2Fquassel.cpp;h=f890740d2e4aba4ad3d50f8f6dae3c383657dd40;hp=20754afc536b3301d41b7ed925888a0f7cd8328c;hb=23d27de1430fb9c77af38fa6cddcf1c0b3b39cde;hpb=08a3b942d11b6b6f5939e7c80e26c4a6cde7c785;ds=sidebyside
diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 20754afc..f890740d 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -170,8 +170,7 @@ void Quassel::setupBuildInfo(const QString &generated) {
_buildInfo.plainVersionString = QString("v%1 (dist-%2)")
.arg(_buildInfo.baseVersion)
.arg(_buildInfo.commitHash.left(7));
- _buildInfo.fancyVersionString
- = QString("v%1 (dist-%2)")
+ _buildInfo.fancyVersionString = QString("v%1 (dist-%2)")
.arg(_buildInfo.baseVersion)
.arg(_buildInfo.commitHash.left(7))
.arg(_buildInfo.commitHash);
@@ -183,13 +182,13 @@ void Quassel::setupBuildInfo(const QString &generated) {
// analyze what we got from git-describe
QRegExp rx("(.*)-(\\d+)-g([0-9a-f]+)$");
if(rx.exactMatch(_buildInfo.generatedVersion)) {
- QString distance = rx.cap(2) == "0" ? QString() : QString(" [+%1]").arg(rx.cap(2));
- _buildInfo.plainVersionString = QString("v%1%2 (git-%3%4)")
- .arg(rx.cap(1), distance, rx.cap(3))
+ QString distance = rx.cap(2) == "0" ? QString() : QString("%1+%2 ").arg(rx.cap(1), rx.cap(2));
+ _buildInfo.plainVersionString = QString("v%1 (%2git-%3%4)")
+ .arg(_buildInfo.baseVersion, distance, rx.cap(3))
.arg(_buildInfo.isSourceDirty ? "*" : "");
if(!_buildInfo.commitHash.isEmpty()) {
- _buildInfo.fancyVersionString = QString("v%1%2 (git-%3%4)")
- .arg(rx.cap(1), distance, rx.cap(3))
+ _buildInfo.fancyVersionString = QString("v%1 (%2git-%3%4)")
+ .arg(_buildInfo.baseVersion, distance, rx.cap(3))
.arg(_buildInfo.isSourceDirty ? "*" : "")
.arg(_buildInfo.commitHash);
}