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

This commit is contained in:
Julien Wadel 2020-10-09 10:47:50 +02:00
parent 8b0270dd2a
commit 689cbc7c01
3 changed files with 16 additions and 4 deletions

View file

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

View file

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

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