diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e7cb587c..a1b0b3340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 4.2.0 - Unknown +## 4.2.0 - 2020-06-26 ### Added diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 8e4ae57ac..63a6ed6e5 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.0) +project(linphoneqt VERSION 4.3.0) 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 b14be0bd0..199d8c9ae 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -822,9 +822,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 () {