diff options
| author |  wodim | 2019-04-01 15:01:02 +0200 |
|---|---|---|
| committer |  GitHub | 2019-04-01 15:01:02 +0200 |
| commit | 1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9 (patch) | |
| tree | 94cfdd5000b6b0d6af1272e89f8b234fd8c484d4 /src/modules/about/AboutDialog.cpp | |
| parent | Add support for Python 3 (diff) | |
| parent | uintUserListMinimumWidth: Reduce minimum due to account for certain combinati... (diff) | |
| download | KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.gz KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.bz2 KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.zip | |
Merge branch 'master' into python3
Diffstat (limited to 'src/modules/about/AboutDialog.cpp')
| -rw-r--r-- | src/modules/about/AboutDialog.cpp | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp index 2f177a253..c1d33bd34 100644 --- a/src/modules/about/AboutDialog.cpp +++ b/src/modules/about/AboutDialog.cpp @@ -42,6 +42,10 @@ #include <QEvent> #include <QCloseEvent> +#ifdef COMPILE_SSL_SUPPORT +#include <openssl/crypto.h> +#endif //COMPILE_SSL_SUPPORT + extern AboutDialog * g_pAboutDialog; /* "<font color=\"#FFFF00\"><b>KVIrc public releases :</b></font><br>\n" \ @@ -159,10 +163,6 @@ AboutDialog::AboutDialog() infoString += ": "; infoString += KviBuildInfo::buildRevision(); infoString += "<br>"; - infoString += __tr2qs_ctx("System name", "about"); - infoString += ": "; - infoString += KviBuildInfo::buildSystem(); - infoString += "<br>"; infoString += __tr2qs_ctx("CPU name", "about"); infoString += ": "; infoString += KviBuildInfo::buildCPU(); @@ -191,6 +191,32 @@ AboutDialog::AboutDialog() infoString += __tr2qs_ctx("Features", "about"); infoString += ": "; infoString += KviBuildInfo::features(); +#ifdef COMPILE_SSL_SUPPORT + infoString += "<br>"; + infoString += __tr2qs_ctx("OpenSSL version", "about"); + infoString += ": "; +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + infoString += SSLeay_version(SSLEAY_VERSION); +#else + infoString += OpenSSL_version(OPENSSL_VERSION); +#endif + infoString += "<br>"; + infoString += __tr2qs_ctx("OpenSSL compiler flags", "about"); + infoString += ": "; +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + infoString += SSLeay_version(SSLEAY_CFLAGS); +#else + infoString += OpenSSL_version(OPENSSL_CFLAGS); +#endif + infoString += "<br>"; + infoString += __tr2qs_ctx("OpenSSL ", "about"); +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + infoString += SSLeay_version(SSLEAY_BUILT_ON); +#else + infoString += OpenSSL_version(OPENSSL_BUILT_ON); +#endif + infoString += "<br>"; +#endif //COMPILE_SSL_SUPPORT v->setText(infoString); @@ -220,7 +246,7 @@ AboutDialog::AboutDialog() QString szLicense; QString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "COPYING"); + g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "ABOUT-LICENSE"); if(!KviFileUtils::loadFile(szLicensePath, szLicense)) { |