logic: Fixed license checker did not ignore commit number in expiration version

This commit is contained in:
Eberhard Graether
2018-04-21 04:54:59 +02:00
parent 91b4e80384
commit 83cd1b94b6
3 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -432,7 +432,7 @@ bool License::isExpired() const
else
{
Version version = Version::fromString(m_expire);
return Version::getApplicationVersion() > version;
return Version::getApplicationVersion().toShortVersion() > version;
}
}
+5
View File
@@ -95,6 +95,11 @@ bool Version::isValid() const
return (0 < m_minorNumber && m_minorNumber < 5 && m_year > 2016);
}
Version Version::toShortVersion() const
{
return Version(m_year, m_minorNumber);
}
std::string Version::toShortString() const
{
std::stringstream ss;
+2
View File
@@ -16,6 +16,8 @@ public:
bool isEmpty() const;
bool isValid() const;
Version toShortVersion() const;
std::string toString() const;
std::string toShortString() const;
std::string toDisplayString() const;