X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=a9798054f5cc427389b5bc151e678b549365c351;hp=a43a707b21a5ac117aca8f22c4c794bcf5a13b91;hb=84b0f5fb3219bcc777f74f609c88011c86873f6c;hpb=dee6c478632feeae5c845be82251117556ff1511

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index a43a707b..a9798054 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -178,8 +178,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-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
+      _buildInfo.fancyVersionString = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
                                         .arg(_buildInfo.baseVersion)
                                         .arg(_buildInfo.commitHash.left(7))
                                         .arg(_buildInfo.commitHash);
@@ -191,13 +190,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-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
-                                          .arg(rx.cap(1), distance, rx.cap(3))
+        _buildInfo.fancyVersionString = QString("v%1 (%2git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
+                                          .arg(_buildInfo.baseVersion, distance, rx.cap(3))
                                           .arg(_buildInfo.isSourceDirty ? "*" : "")
                                           .arg(_buildInfo.commitHash);
       }