diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 2 | ||||
| -rw-r--r-- | src/sdk/sdkapp.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 149911d61..d488731df 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -182,6 +182,8 @@ void PackageManagerCoreData::setDynamicPredefinedVariables() #endif #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) + m_variables.insert(QLatin1String("FrameworkVersion"), QLatin1String(QUOTE(IFW_VERSION_STR))); + // Undocumented, left for compatibility with scripts using the old key m_variables.insert(QLatin1String("IFW_VERSION_STR"), QLatin1String(QUOTE(IFW_VERSION_STR))); #undef QUOTE #undef QUOTE_ diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 295456e3b..79c112642 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -57,9 +57,6 @@ #include <QMessageBox> #include <QMetaEnum> -#define QUOTE_(x) #x -#define QUOTE(x) QUOTE_(x) - template<class T> class SDKApp : public T { @@ -194,8 +191,6 @@ 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. |