Skip to content

Commit 8aa7140

Browse files
committed
More svn version removal
1 parent 8799cc9 commit 8aa7140

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

python/core/qgis.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public:
3333
static const int QGIS_VERSION_INT;
3434
// Release name
3535
static const char* QGIS_RELEASE_NAME;
36-
// The subversion version
37-
static const char* QGIS_SVN_VERSION;
36+
// The development (GIT) version
37+
static const char* QGIS_DEV_VERSION;
3838

3939
// Enumerations
4040
//

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static void setTitleBarText_( QWidget & qgisApp )
274274

275275
if ( QString( QGis::QGIS_VERSION ).endsWith( "Trunk" ) )
276276
{
277-
caption += QString( "r%1" ).arg( QGis::QGIS_SVN_VERSION );
277+
caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
278278
}
279279
else
280280
{

src/core/qgis.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
// Version string
2929
const char* QGis::QGIS_VERSION = VERSION;
3030

31+
// development version
32+
const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
33+
3134
// Version number used for comparing versions using the
3235
// "Check QGIS Version" function
3336
const int QGis::QGIS_VERSION_INT = VERSION_INT;

src/core/qgis.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* (at your option) any later version. *
1515
* *
1616
***************************************************************************/
17-
/* $Id$ */
1817

1918
#ifndef QGIS_H
2019
#define QGIS_H
@@ -39,8 +38,8 @@ class CORE_EXPORT QGis
3938
static const int QGIS_VERSION_INT;
4039
// Release name
4140
static const char* QGIS_RELEASE_NAME;
42-
// The subversion version
43-
static const char* QGIS_SVN_VERSION;
41+
// The development version
42+
static const char* QGIS_DEV_VERSION;
4443

4544
// Enumerations
4645
//

0 commit comments

Comments
 (0)