From 1a279ca158dde8a755caa64bdde5fadbf0a72cd5 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 16 Mar 2017 10:57:23 +0100 Subject: [PATCH] About: Show the runtime versions of Qt and OpenSSL #5592 I didn't want to touch this visible translated string in a patch release so I just switched the data. For Qt versions before 5, we continue to show the build-time version of OpenSSL but it's clearly marked as such. --- src/libsync/theme.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index be6f614894..0681ebbed0 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -23,6 +23,7 @@ #ifndef TOKEN_AUTH_ONLY #include #endif +#include #include "owncloudtheme.h" @@ -297,8 +298,13 @@ QString Theme::gitSHA1() const " on %3, %4 using Qt %5, %6

") .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) .arg(__DATE__).arg(__TIME__) - .arg(QT_VERSION_STR) - .arg(QString::fromAscii(OPENSSL_VERSION_TEXT)); + .arg(QString::fromAscii(qVersion())) +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + .arg(QSslSocket::sslLibraryVersionString()); +#else + .arg(QCoreApplication::translate("ownCloudTheme::about()", "built with %1").arg( + QString::fromAscii(OPENSSL_VERSION_TEXT))); +#endif #endif return devString; }