From f38d86aeb08c760240c566c505c1a40a837cd0b0 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 9 May 2017 10:40:56 +0100 Subject: [PATCH] Make ready v1.9.0-beta --- Build.properties | 2 +- ChangeLog | 2 +- src/gui/src/AboutDialog.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Build.properties b/Build.properties index 2aaa42d5..96071ca4 100644 --- a/Build.properties +++ b/Build.properties @@ -4,4 +4,4 @@ SYNERGY_VERSION_MAJOR = 1 SYNERGY_VERSION_MINOR = 9 SYNERGY_VERSION_PATCH = 0 -SYNERGY_VERSION_STAGE = git +SYNERGY_VERSION_STAGE = beta2 diff --git a/ChangeLog b/ChangeLog index 67667f83..0882fd01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v1.9.0-beta2 [unreleased] +v1.9.0-beta2 =========== Bug #5901 - Stored serial key corrupted on macOS Bug #5757 - Failure to build against OpenSSL v1.1.0 diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp index 52613480..51605e1e 100644 --- a/src/gui/src/AboutDialog.cpp +++ b/src/gui/src/AboutDialog.cpp @@ -29,7 +29,10 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) : m_versionChecker.setApp(synergyApp); 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); QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified();