From 91c90523d34030855603b98843fe28269c3e3bdd Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Tue, 18 Aug 2020 13:55:25 +0100
Subject: [PATCH 1/2] #6748 Set current build year in copyright statement

---
 src/gui/src/AboutDialog.cpp    | 13 +++++++++++++
 src/gui/src/AboutDialogBase.ui | 10 +---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp
index da6c6ba21..8e92f44ff 100644
--- a/src/gui/src/AboutDialog.cpp
+++ b/src/gui/src/AboutDialog.cpp
@@ -27,6 +27,16 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
 {
 	setupUi(this);
 
+	QString aboutText(R"(<p>
+Keyboard and mouse sharing application. Cross platform and open source.<br /><br />
+Copyright © 2012-%%YEAR%% Symless Ltd.<br />
+Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
+Synergy is released under the GNU General Public License (GPLv2).<br /><br />
+Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
+The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br />
+Visit our website for help and info (symless.com).
+</p>)");
+
 	m_versionChecker.setApp(synergyApp);
 	QString version = m_versionChecker.getVersion();
 #ifdef SYNERGY_REVISION
@@ -39,6 +49,9 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
 	QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy");
 	m_pLabelBuildDate->setText(buildDate.toString(Qt::SystemLocaleLongDate));
 
+	//Sets the current build year into the copyright text
+	label_3->setText(aboutText.replace(QString("%%YEAR%%"), QString::number(buildDate.year())));
+
 	// change default size based on os
 #if defined(Q_OS_MAC)
 	QSize size(600, 380);
diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui
index b2cbe5e14..8cf6f63fc 100644
--- a/src/gui/src/AboutDialogBase.ui
+++ b/src/gui/src/AboutDialogBase.ui
@@ -50,15 +50,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;p&gt;
-Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
-Copyright © 2012-2019 Symless Ltd.&lt;br /&gt;
-Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
-Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
-Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
-The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
-Visit our website for help and info (symless.com).
-&lt;/p&gt;</string>
+      <string></string>
      </property>
      <property name="margin">
       <number>1</number>

From 9f5f05c88328f1aa200e252bd0680f60dbd162aa Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Tue, 18 Aug 2020 13:57:14 +0100
Subject: [PATCH 2/2] #6748 Updated ChangeLog

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ddf3d2029..51e9600e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+v1.12.0-rc3
+===========
+
+Bug fixes:
+- #6748 Copyright year in about dialog isn't updated
+
 v1.12.0-rc2
 ===========