exclude release name from version string (fixes #15258)

jef-n · jef-n · commit bce5ed52a855 · 2016-08-15T18:24:28.000+02:00
(cherry picked from commit 1391aad)
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -5,10 +5,10 @@
 #define QGSCONFIG_H
 
 // Version must be specified according to
-// <int>.<int>.<int>-<any text>.
+// <int>.<int>.<int>"
 // or else upgrading old project file will not work
 // reliably.
-#define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${RELEASE_NAME}"
+#define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}"
 
 //used in vim src/core/qgis.cpp
 //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -376,7 +376,7 @@ static void setTitleBarText_( QWidget & qgisApp )
 {
   QString caption = QgisApp::tr( "QGIS " );
 
-  if ( QGis::QGIS_VERSION.endsWith( "Master" ) )
+  if ( QGis::QGIS_RELEASE_NAME == "Master" )
   {
     caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
   }

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ static void setTitleBarText_( QWidget & qgisApp )`
`376`	`376`	`{`
`377`	`377`	`QString caption = QgisApp::tr( "QGIS " );`
`378`	`378`
`379`		`- if ( QGis::QGIS_VERSION.endsWith( "Master" ) )`
	`379`	`+ if ( QGis::QGIS_RELEASE_NAME == "Master" )`
`380`	`380`	`{`
`381`	`381`	`caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );`
`382`	`382`	`}`