Make ready v1.9.0-beta

This commit is contained in:
Andrew Nelless 2017-05-09 10:40:56 +01:00
parent ab566bb5a4
commit f38d86aeb0
3 changed files with 6 additions and 3 deletions

View File

@ -4,4 +4,4 @@
SYNERGY_VERSION_MAJOR = 1 SYNERGY_VERSION_MAJOR = 1
SYNERGY_VERSION_MINOR = 9 SYNERGY_VERSION_MINOR = 9
SYNERGY_VERSION_PATCH = 0 SYNERGY_VERSION_PATCH = 0
SYNERGY_VERSION_STAGE = git SYNERGY_VERSION_STAGE = beta2

View File

@ -1,4 +1,4 @@
v1.9.0-beta2 [unreleased] v1.9.0-beta2
=========== ===========
Bug #5901 - Stored serial key corrupted on macOS Bug #5901 - Stored serial key corrupted on macOS
Bug #5757 - Failure to build against OpenSSL v1.1.0 Bug #5757 - Failure to build against OpenSSL v1.1.0

View File

@ -29,7 +29,10 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
m_versionChecker.setApp(synergyApp); m_versionChecker.setApp(synergyApp);
QString version = m_versionChecker.getVersion(); QString version = m_versionChecker.getVersion();
version = version + '-' + SYNERGY_VERSION_STAGE + '-' + SYNERGY_REVISION; version = version + '-' + SYNERGY_VERSION_STAGE;
#ifdef SYNERGY_REVISION
version += '-' + SYNERGY_REVISION;
#endif
m_pLabelSynergyVersion->setText(version); m_pLabelSynergyVersion->setText(version);
QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified(); QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified();