From 07de8ed63990568c053d04ca90a5dd647617ed23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Thu, 9 Nov 2023 09:34:33 +0000
Subject: [PATCH] Subrepo bump and version info onto the main page
---
CMakeLists.txt | 6 ++++++
qtquickdesigner-components | 2 +-
resources/version.json | 4 +++-
www/scripts/script.js | 4 ++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167863a..82acd63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,16 @@ install(
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
+
execute_process(COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR}/qtquickdesigner-components describe --always --tags OUTPUT_VARIABLE QT_QUICK_COMPONENTS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR}/emsdk describe --always --tags OUTPUT_VARIABLE EMSDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+
configure_file(${CMAKE_SOURCE_DIR}/resources/version.json ${CMAKE_INSTALL_PREFIX}/resources/meta-data/version.json)
message(STATUS "GIT_VERSION: ${GIT_VERSION}")
+message(STATUS "QT_QUICK_COMPONENTS_VERSION: ${QT_QUICK_COMPONENTS_VERSION}")
+message(STATUS "EMSDK_VERSION: ${EMSDK_VERSION}")
message(STATUS "QT_VERSION: ${QT_VERSION}")
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX})
diff --git a/qtquickdesigner-components b/qtquickdesigner-components
index b3f1dcf..0e45747 160000
--- a/qtquickdesigner-components
+++ b/qtquickdesigner-components
@@ -1 +1 @@
-Subproject commit b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71
+Subproject commit 0e457477d54b068abc89cf124daedefe0436dd89
diff --git a/resources/version.json b/resources/version.json
index 1258130..b5b10de 100644
--- a/resources/version.json
+++ b/resources/version.json
@@ -1,4 +1,6 @@
{
"appVersion": "@GIT_VERSION@",
- "qtVersion": "@QT_VERSION@"
+ "qtVersion": "@QT_VERSION@",
+ "qtQuickComponentsVersion": "@QT_QUICK_COMPONENTS_VERSION@",
+ "emsdkVersion": "@EMSDK_VERSION@"
}
diff --git a/www/scripts/script.js b/www/scripts/script.js
index 690dfef..f6ae3ba 100644
--- a/www/scripts/script.js
+++ b/www/scripts/script.js
@@ -148,9 +148,13 @@ function showVersionInfo() {
versionInfo = request.response;
var appVersion = json.appVersion;
var qtVersion = json.qtVersion;
+ var qtQuickComponentsVersion = json.qtQuickComponentsVersion;
+ var emsdkVersion = json.emsdkVersion;
var webServiceVersion = json.webServiceVersion;
var versionText =
"Design Viewer " + appVersion +
+ "<br>Qt Quick Components " + qtQuickComponentsVersion +
+ "<br>Emscripten SDK " + emsdkVersion +
"<br>Built with Qt " + qtVersion
document.querySelector("#versioninfo_main").innerHTML = versionText;
};
--
GitLab