mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 06:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recompute version from git version to pass the update checker with the release

Browse source
This commit is contained in:
Julien Wadel 2020-06-26 21:03:37 +02:00
parent 5e40d5c82e
commit 439d188222
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -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

2
linphone-app/CMakeLists.txt
View file

@ -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}")

16
linphone-app/src/app/App.cpp
View file

@ -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())
);
}

2
linphone-app/src/app/App.hpp
View file

@ -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 () {