Merge with branch1.2

1 files changed, 4 insertions, 6 deletions

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index fba9c94f..7b311263 100644
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -37,16 +37,14 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";

   m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";

 

-  addLicense("Qt 4.8.5", LICENSE_LGPL3);

+  addLicense("Qt 5.4", LICENSE_LGPL3);

   addLicense("Qt Json", LICENSE_GPL3);

   addLicense("Boost Library", LICENSE_BOOST);

-  addLicense("Tango Icon Theme", LICENSE_NONE);

-  addLicense("RRZE Icon Set", LICENSE_CCBY3);

   addLicense("7-zip", LICENSE_LGPL3);

   addLicense("ZLib", LICENSE_ZLIB);

-  addLicense("NIF File Format Library", LICENSE_BSD3);

-  addLicense("BOSS (modified)", LICENSE_GPL3);

-  addLicense("Alphanum Algorithm", LICENSE_ZLIB);

+  addLicense("Tango Icon Theme", LICENSE_NONE);

+  addLicense("RRZE Icon Set", LICENSE_CCBY3);

+  addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);

   addLicense("Castle Core", LICENSE_APACHE2);

 

   ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));