From cbe8c8c616eae1fb3b62ada31e0725827d140fe2 Mon Sep 17 00:00:00 2001
From: wodim
Date: Fri, 27 Nov 2015 12:22:46 +0100
Subject: Show the current Qt version and the Qt version that was used to build
 in the About dialog.

---
 src/kvilib/config/KviBuildInfo.cpp | 5 +++++
 src/kvilib/config/KviBuildInfo.h   | 6 ++++++
 src/kvilib/ext/KviOsInfo.cpp       | 5 +++++
 src/kvilib/ext/KviOsInfo.h         | 1 +
 src/modules/about/AboutDialog.cpp  | 8 ++++++++
 5 files changed, 25 insertions(+)

(limited to 'src')

diff --git a/src/kvilib/config/KviBuildInfo.cpp b/src/kvilib/config/KviBuildInfo.cpp
index e4064b8f1..4431cde62 100644
--- a/src/kvilib/config/KviBuildInfo.cpp
+++ b/src/kvilib/config/KviBuildInfo.cpp
@@ -97,4 +97,9 @@ namespace KviBuildInfo
 		#endif
 		return rev;
 	}
+
+	QString qtVersion()
+	{
+		return QString(QT_VERSION_STR);
+	}
 }
diff --git a/src/kvilib/config/KviBuildInfo.h b/src/kvilib/config/KviBuildInfo.h
index f0be561f7..03308ddb2 100644
--- a/src/kvilib/config/KviBuildInfo.h
+++ b/src/kvilib/config/KviBuildInfo.h
@@ -126,6 +126,12 @@ namespace KviBuildInfo
 	* \return QString
 	*/
 	extern KVILIB_API QString buildRevision();
+
+	/**
+	* \brief Returns the Qt version used to build the KVIrc executable.
+	* \return QString
+	*/
+	extern KVILIB_API QString qtVersion();
 }
 
 #endif //!_KVI_BUILDINFO_H_
diff --git a/src/kvilib/ext/KviOsInfo.cpp b/src/kvilib/ext/KviOsInfo.cpp
index 01973c493..0ba22270c 100644
--- a/src/kvilib/ext/KviOsInfo.cpp
+++ b/src/kvilib/ext/KviOsInfo.cpp
@@ -715,4 +715,9 @@ namespace KviOsInfo
 		else
 			return KviQString::Empty;
 	}
+
+	QString qtVersion()
+	{
+		return QString(qVersion());
+	}
 }
diff --git a/src/kvilib/ext/KviOsInfo.h b/src/kvilib/ext/KviOsInfo.h
index 9aec7a18a..873ac9d5a 100644
--- a/src/kvilib/ext/KviOsInfo.h
+++ b/src/kvilib/ext/KviOsInfo.h
@@ -38,6 +38,7 @@ namespace KviOsInfo
 	extern KVILIB_API QString machine();
 	extern KVILIB_API QString nodename();
 	extern KVILIB_API QString hostname();
+	extern KVILIB_API QString qtVersion();
 }
 
 #endif //!_KVI_OSINFO_H_
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index f52faecac..49c9ef32f 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -136,6 +136,10 @@ AboutDialog::AboutDialog()
 	infoString += __tr2qs_ctx("Architecture","about");
 	infoString += ": ";
 	infoString += KviOsInfo::machine();
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("Qt Version","about");
+	infoString += ": ";
+	infoString += KviOsInfo::qtVersion();
 	infoString += "<br><br>";
 	infoString += "<b>";
 	infoString += __tr2qs_ctx("Build Info","about");
@@ -176,6 +180,10 @@ AboutDialog::AboutDialog()
 	infoString += __tr2qs_ctx("Compiler Flags","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCompilerFlags();
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("Qt Version","about");
+	infoString += ": ";
+	infoString += KviBuildInfo::qtVersion();
 
 	v->setText(infoString);
 
-- 
cgit v1.3.1-10-gc9f91