[Uml-devel] branches/work/soc-umbrello/umbrello

[Ralf Habacker]

SVN commit 1288098 by habacker:

Reduced differences to trunk.

 M  +10 -3     version.h  


--- branches/work/soc-umbrello/umbrello/version.h #1288097:1288098
@@ -4,21 +4,28 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
 #ifndef UMBRELLO_VERSION_H
 #define UMBRELLO_VERSION_H
 
+#include "revision.h"
+
 #include <kdeversion.h>
 
 inline QByteArray umbrelloVersion()
 {
-    return QString("%1.%2.%3")
+    QString versionStr = QString("%1.%2.%3")
         .arg(KDE::versionMajor()-2)
         .arg(KDE::versionMinor())
-        .arg(KDE::versionRelease()).toLatin1();
+        .arg(KDE::versionRelease());
+    QString revisionStr = QString("-r%1").arg(REVISION);
+    if (revisionStr != "-r0") {
+        versionStr.append(revisionStr);
 }
+    return versionStr.toLatin1();
+}
 
 #endif