From: Christian Kamm Date: Fri, 10 Mar 2017 14:32:25 +0000 (+0100) Subject: Add more versions to --version #5592 X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~790^2~8 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ca9773e9d6acac1958f5c471caf0be8c55bb10d;p=nextcloud-desktop.git Add more versions to --version #5592 * Add git revision, if available * Add SSL runtime version * Add compile-time Qt version --- diff --git a/src/gui/application.cpp b/src/gui/application.cpp index d8c8b6fd4..843f8bd0c 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -37,6 +37,7 @@ #include "updater/ocupdater.h" #include "excludedfiles.h" #include "owncloudsetupwizard.h" +#include "version.h" #include "config.h" @@ -52,6 +53,8 @@ #include #include +#include + class QSocket; namespace OCC { @@ -508,7 +511,13 @@ void Application::showVersion() stream << _theme->appName().toLatin1().constData() << QLatin1String(" version ") << _theme->version().toLatin1().constData() << endl; - stream << "Using Qt " << qVersion() << endl; +#ifdef GIT_SHA1 + stream << "Git revision " << GIT_SHA1 << endl; +#endif + stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl; +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl; +#endif displayHelpText(helpText); }