Skip to content

Commit

Permalink
More svn version removal
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Jul 6, 2011
1 parent 8799cc9 commit 8aa7140
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions python/core/qgis.sip
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public:
static const int QGIS_VERSION_INT;
// Release name
static const char* QGIS_RELEASE_NAME;
// The subversion version
static const char* QGIS_SVN_VERSION;
// The development (GIT) version
static const char* QGIS_DEV_VERSION;

// Enumerations
//
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 3 additions & 0 deletions src/core/qgis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions src/core/qgis.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */

#ifndef QGIS_H
#define QGIS_H
Expand All @@ -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
static const char* QGIS_SVN_VERSION;
// The development version
static const char* QGIS_DEV_VERSION;

// Enumerations
//
Expand Down

0 comments on commit 8aa7140

Please sign in to comment.