More svn version removal

qgis · Jul 6, 2011 · 8aa7140 · 8aa7140
1 parent 8799cc9
commit 8aa7140
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/python/core/qgis.sip b/python/core/qgis.sip
@@ -33,8 +33,8 @@ public:
   static const int QGIS_VERSION_INT;
   // Release name
   static const char* QGIS_RELEASE_NAME;
-  // The subversion version
+  // The development (GIT) version
-  static const char* QGIS_SVN_VERSION;
+  static const char* QGIS_DEV_VERSION;
 
   // Enumerations
   //

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -274,7 +274,7 @@ static void setTitleBarText_( QWidget & qgisApp )
 
   if ( QString( QGis::QGIS_VERSION ).endsWith( "Trunk" ) )
   {
-    caption += QString( "r%1" ).arg( QGis::QGIS_SVN_VERSION );
+    caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
   }
   else
   {

diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -28,6 +28,9 @@
 // Version string
 const char* QGis::QGIS_VERSION = VERSION;
 
+// development version
+const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
+
 // Version number used for comparing versions using the
 // "Check QGIS Version" function
 const int QGis::QGIS_VERSION_INT = VERSION_INT;

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -14,7 +14,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* $Id$ */
 
 #ifndef QGIS_H
 #define QGIS_H
@@ -39,8 +38,8 @@ class CORE_EXPORT QGis
     static const int QGIS_VERSION_INT;
     // Release name
     static const char* QGIS_RELEASE_NAME;
-    // The subversion version
+    // The development version
-    static const char* QGIS_SVN_VERSION;
+    static const char* QGIS_DEV_VERSION;
 
     // Enumerations
     //