diff --git a/CMakeLists.txt b/CMakeLists.txt index 167863af82989bd6034fbfa24e061c2f3b16e4cb..82acd636913c818503dbca06b479c1deaa7ca2e4 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 b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71..0e457477d54b068abc89cf124daedefe0436dd89 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 12581307eb052e06f25b6f3789001d1a699e5110..b5b10deba8db9f59d8e2a6a6cde2a6b77fd591e2 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 690dfefc688c7ce902caf8428e89d23111f9062e..f6ae3ba1c1bb1eace1fdb1f70f3d450d7fd67e76 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; };