Skip to content
Permalink
Browse files

exclude release name from version string

  • Loading branch information
jef-n committed Aug 15, 2016
1 parent 977b5f2 commit 1391aad2f713a796b0ac3d0c22bec6c1c7ada3bb
Showing with 3 additions and 3 deletions.
  1. +2 −2 cmake_templates/qgsconfig.h.in
  2. +1 −1 src/app/qgisapp.cpp
@@ -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
@@ -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 );
}

0 comments on commit 1391aad

Please sign in to comment.
You can’t perform that action at this time.