From 85d9f14aa8bac16ab341662c770b64a15c21628b Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Wed, 3 Jan 2018 16:39:32 +0100
Subject: Changed from qbs to cmake

---
 src/forms/aboutdialog.cpp | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'src/forms/aboutdialog.cpp')

diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp
index 25c5384..3f89118 100644
--- a/src/forms/aboutdialog.cpp
+++ b/src/forms/aboutdialog.cpp
@@ -8,6 +8,28 @@
 
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
+#include "version.h"
+
+constexpr const char *getCompiler()
+{
+    // clang also defines __GNUC__, so we need to check for clang first
+#if defined(__clang__)
+    return "Clang " __clang_version__;
+#elif defined(__GNUC__)
+    return "GCC " __VERSION__;
+#else
+    return "unknown compiler";
+#endif
+}
+
+inline const QString getLongVersion()
+{
+#ifdef GIT_DESCRIBE
+    return QString(GIT_DESCRIBE);
+#else
+    return qApp->applicationVersion();
+#endif
+}
 
 AboutDialog::AboutDialog(QWidget *parent) :
     QDialog(parent),
@@ -22,7 +44,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     aboutLabel->setWordWrap(true);
     aboutLabel->setText(tr("<h2>smolbote %1</h2>"
                            "<p><i>yet another Qute browser</i></p>")
-                        .arg(qApp->applicationVersion().left(qApp->applicationVersion().indexOf('-'))));
+                        .arg(qApp->applicationVersion()));
     ui->toolBox->addItem(aboutLabel, tr("About"));
 
     QLabel *licenseLabel = new QLabel(this);
@@ -50,7 +72,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
                           "<li>Qt %3</li>"
                           "<li>libconfig</li>"
                           "</ul></p>")
-                       .arg(qApp->applicationVersion(), getCompiler(), qVersion()));
+                       .arg(getLongVersion(), getCompiler(), qVersion()));
     ui->toolBox->addItem(libsLabel, tr("Details"));
 }
 
@@ -58,14 +80,3 @@ AboutDialog::~AboutDialog()
 {
     delete ui;
 }
-
-constexpr const char *getCompiler()
-{
-#if defined(__clang__)
-    return "Clang " __clang_version__;
-#elif defined(__GNUC__)
-    return "GCC " __VERSION__;
-#else
-    return "unknown compiler";
-#endif
-}
-- 
cgit v1.2.1