Index: main.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r84c5373209a1a488c00917995f5553d442d159a4 --- main.cpp (.../main.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ main.cpp (.../main.cpp) (revision 84c5373209a1a488c00917995f5553d442d159a4) @@ -24,6 +24,7 @@ * - \subpage CommandLineSwitches * - \subpage DenaliMessageStructure * - \subpage MessageFlow + * - \subpage GeneralModelsDescription * - \subpage MessageView */ @@ -194,32 +195,40 @@ } /*! * \brief setApplicationVersion - * \details sets up the application version regarding the environment valiables + * \details sets up the application version regarding the environment variables * which are set by bamboo and if those are not set value of 0 will be used * and revision(build) version will be set to current date/time. */ void setApplicationVersion() { - QString ver_major = QString("%1").arg(VER_MAJOR); - if (ver_major.isEmpty()) { - ver_major = VER_MAJOR_DEV; + QString ver_major = QString("%1").arg(VER_MAJOR ); + QString ver_minor = QString("%1").arg(VER_MINOR ); + QString ver_micro = QString("%1").arg(VER_MICRO ); + QString ver_revis = QString("%1").arg(VER_REVIS ); + QString ver_branch = QString("%1").arg(VER_BRANCH ); + + bool isOnMaster = !ver_branch.compare("master"); + if (isOnMaster) { + ver_branch = ""; + ver_major += '.'; + ver_minor += '.'; + ver_micro += '.'; + ver_revis += '.'; } - QString ver_minor = QString("%1").arg(VER_MINOR); - if (ver_minor.isEmpty()) { - ver_minor = VER_MINOR_DEV; + else { + ver_branch = VER_BRANCH ; + ver_branch += '.'; + ver_major = VER_MAJOR_DEV ; + ver_minor = VER_MINOR_DEV ; + ver_micro = VER_MICRO_DEV ; + ver_revis = VER_REVIS_DEV ; } - QString ver_micro = QString("%1").arg(VER_MICRO); - if (ver_micro.isEmpty()) { - ver_micro = VER_MICRO_DEV; - } - QString ver_revis = QString("%1").arg(VER_REVIS); - if (ver_revis.isEmpty()) { - ver_revis = VER_REVIS_DEV; - } - QCoreApplication::setApplicationVersion(QString("%1.%2.%3.%4") - .arg(ver_major) - .arg(ver_minor) - .arg(ver_micro) - .arg(ver_revis)); + QCoreApplication::setApplicationVersion( + QString("%1%2.%3.%4.%5") + .arg(ver_branch) + .arg(ver_major) + .arg(ver_minor) + .arg(ver_micro) + .arg(ver_revis)); } #ifdef UNIT_TEST