From 1fec448cf4e608dc367388a66df0ad2b68699b65 Mon Sep 17 00:00:00 2001 From: zomfg Date: Fri, 29 May 2020 13:13:53 +0200 Subject: [PATCH] settigns window: build time qt version --- Software/src/SettingsWindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Software/src/SettingsWindow.cpp b/Software/src/SettingsWindow.cpp index 9d4ee42f3..3cab18442 100644 --- a/Software/src/SettingsWindow.cpp +++ b/Software/src/SettingsWindow.cpp @@ -2043,18 +2043,20 @@ void SettingsWindow::versionsUpdate() DEBUG_LOW_LEVEL << Q_FUNC_INFO; // use template to construct version string - QString versionsTemplate = tr("

software %1 (revision %2), firmware %3

"); + QString versionsTemplate = tr("

software %1 (rev %2, Qt %4), firmware %3

"); #ifdef GIT_REVISION versionsTemplate = versionsTemplate.arg( QApplication::applicationVersion(), GIT_REVISION, - fimwareVersion ); + fimwareVersion, + QT_VERSION_STR); #else versionsTemplate = versionsTemplate.arg( QApplication::applicationVersion(), "unknown", - fimwareVersion ); + fimwareVersion, + QT_VERSION_STR); versionsTemplate.remove(QRegExp(" \\([^()]+unknown[^()]+\\)")); #endif