From d0d19971eed42290f1b07374ffa736015e31d6e3 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Fri, 12 Nov 2021 15:06:11 +0100 Subject: [PATCH] Add Qt version to build info --- ScreenPlay/qml/Settings/Settings.qml | 2 +- ScreenPlay/src/settings.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml index 9175efb5..c61f6ffa 100644 --- a/ScreenPlay/qml/Settings/Settings.qml +++ b/ScreenPlay/qml/Settings/Settings.qml @@ -478,7 +478,7 @@ Item { SettingsButton { icon.source: "qrc:/assets/icons/icon_launch.svg" headline: qsTr("Version") - description: qsTr("ScreenPlay Build Version ") + ScreenPlay.settings.gitBuildHash + description: qsTr("ScreenPlay Build Version \n") + ScreenPlay.settings.gitBuildHash buttonText: qsTr("Open Changelog") onButtonPressed: Qt.openUrlExternally("https://gitlab.com/kelteseth/ScreenPlay/-/releases") } diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index 76ae8e69..745a36c2 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -101,7 +101,8 @@ Settings::Settings(const std::shared_ptr& globalVariables, initInstalledPath(); setupWidgetAndWindowPaths(); - setGitBuildHash(COMPILE_INFO); + const QString qtVersion = QString("Qt Version: %1.%2.%3").arg(QT_VERSION_MAJOR).arg(QT_VERSION_MINOR).arg(QT_VERSION_PATCH); + setGitBuildHash(COMPILE_INFO + qtVersion); setSteamVersion(!(QString(SCREENPLAY_STEAM).compare("OFF", Qt::CaseInsensitive) ? false : true)); } @@ -194,7 +195,7 @@ void Settings::restoreDefault(const QString& appConfigLocation, const QString& s void Settings::initInstalledPath() { - //If empty use steam workshop location + // If empty use steam workshop location if (QString(m_qSettings.value("ScreenPlayContentPath").toString()).isEmpty()) { /*