chatterino2
Code Issues

Fix Version::dateOfBuild_ on Windows

Browse Source 
The `CHATTERINO_NIGHTLY_VERSION_STRING` defines differ on Windows and
MacOS/Linux. (See `appveyor.yml` and `travis.yml`, respectively.)
Therefore, the Windows version string looked really messed up but it
should be fixed now.
This commit is contained in:
Leon Richardt
2019-09-21 20:24:52 +02:00
parent 5871414e6b
commit 19b2102fed
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Version.cpp
+2 -7
View File
@@ -16,11 +16,11 @@ Version::Version()
this->commitHash_ = this->commitHash_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_GIT_HASH)).remove('"'); QString(FROM_EXTERNAL_DEFINE(CHATTERINO_GIT_HASH)).remove('"');
// Date of build // Date of build, this is depended on the format not changing
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING #ifdef CHATTERINO_NIGHTLY_VERSION_STRING
this->dateOfBuild_ = this->dateOfBuild_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING)) QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING))
.remove('"'); .remove('"').split(' ')[0];
#endif #endif
// "Full" version string, as displayed in window title // "Full" version string, as displayed in window title
@@ -31,11 +31,6 @@ Version::Version()
} }
this->fullVersion_ += this->version_; this->fullVersion_ += this->version_;
if (Modes::getInstance().isNightly)
{
this->fullVersion_ += this->dateOfBuild_;
}
} }
const Version &Version::getInstance() const Version &Version::getInstance()