diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 5d884b847..9c82cd0ce 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################################################ cmake_minimum_required(VERSION 3.1) -project(linphoneqt VERSION 4.2.2) +project(linphoneqt VERSION 4.2.3) if(ENABLE_BUILD_VERBOSE) #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 4b79a5efb..5a50057ca 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -826,9 +826,21 @@ void App::openAppAfterInit (bool mustBeIconified) { } // ----------------------------------------------------------------------------- - +QString App::getStrippedApplicationVersion(){// x.y.z but if 'z-*' then x.y.z-1 + QString currentVersion = applicationVersion(); + QStringList versions = currentVersion.split('.'); + if(versions.size() >=3){ + currentVersion = versions[0]+"."+versions[1]+"."; + QStringList patchVersions = versions[2].split('-'); + if( patchVersions.size() > 1) + currentVersion += QString::number(patchVersions[0].toInt()-1); + else + currentVersion += patchVersions[0]; + } + return currentVersion; +} void App::checkForUpdate () { CoreManager::getInstance()->getCore()->checkForUpdate( - Utils::appStringToCoreString(applicationVersion()) + Utils::appStringToCoreString(getStrippedApplicationVersion()) ); } diff --git a/linphone-app/src/app/App.hpp b/linphone-app/src/app/App.hpp index a36e74160..c4422056e 100644 --- a/linphone-app/src/app/App.hpp +++ b/linphone-app/src/app/App.hpp @@ -147,7 +147,7 @@ private: emit opened(mIsOpened); } } - + static QString getStrippedApplicationVersion();// x.y.z but if 'z-*' then x.y.z-1 static void checkForUpdate (); static QString getQtVersion () {