About: Show the runtime versions of Qt and OpenSSL #5592
authorChristian Kamm <mail@ckamm.de>
Thu, 16 Mar 2017 09:57:23 +0000 (10:57 +0100)
committerckamm <mail@ckamm.de>
Thu, 16 Mar 2017 11:40:42 +0000 (12:40 +0100)
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

index be6f614894376bfa804db58afb53b37870af3837..0681ebbed015f062a5b9413c5d4fa4e64b6e6d13 100644 (file)
@@ -23,6 +23,7 @@
 #ifndef TOKEN_AUTH_ONLY
 #include <QtGui>
 #endif
+#include <QSslSocket>
 
 #include "owncloudtheme.h"
 
@@ -297,8 +298,13 @@ QString Theme::gitSHA1() const
                    " on %3, %4 using Qt %5, %6</small></p>")
             .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;
 }