diff --git a/.gitignore b/.gitignore index da76bd66..32146df3 100755 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ DSView/qrc_DSView.cpp DSView/qrc_style.cpp DSView/qrc_breeze.cpp DSView/qrc_language.cpp +DSView/config.h moc_*.cpp moc_*.cpp_parameters diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 5d99a0cb..28b6b3d5 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -119,7 +119,7 @@ set(DS_VERSION_MAJOR 1) set(DS_VERSION_MINOR 2) set(DS_VERSION_MICRO 0) set(DS_VERSION_STRING - ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} RC1 + ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}-RC4 ) configure_file ( diff --git a/DSView/config.h b/DSView/config.h index 6e3dcfb7..8d3cc62f 100755 --- a/DSView/config.h +++ b/DSView/config.h @@ -29,6 +29,6 @@ #define DS_VERSION_MAJOR 1 #define DS_VERSION_MINOR 2 #define DS_VERSION_MICRO 0 -#define DS_VERSION_STRING "1.2.0;RC1" +#define DS_VERSION_STRING "1.2.0" "RC4" #endif