summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-11-17 13:26:25 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-11-18 13:30:35 +0200
commit602cd6c8f6fb9c8ed21786bb08c56c81a40203af (patch)
tree804220888feaf6cafff0eaad101293bfbd8a8bb2
parent5937beb27e8e6d68a3efa83afdbd6abefb91a277 (diff)
Set "FrameworkVersion" installer value
This makes it possible to query for the Installer Framework version of the running installer binary from the scripting-API. Change-Id: I88fd12d081aa720cbe95683ee35714e5e2d4908b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rw-r--r--src/sdk/sdkapp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 3a32d0336..9c9e01f95 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -57,6 +57,9 @@
#include <QMessageBox>
#include <QMetaEnum>
+#define QUOTE_(x) #x
+#define QUOTE(x) QUOTE_(x)
+
template<class T>
class SDKApp : public T
{
@@ -196,6 +199,8 @@ public:
QUuid::createUuid().toString(), QUuid::createUuid().toString(),
QInstaller::Protocol::Mode::Production, userArgs, isCommandLineInterface);
}
+ // Set this for convenience usage with the installer JS object
+ m_core->setValue(QLatin1String("FrameworkVersion"), QLatin1String(QUOTE(IFW_VERSION_STR)));
// From Qt5.8 onwards system proxy is used by default. If Qt is built with
// QT_USE_SYSTEM_PROXIES false then system proxies are not used by default.