miss Qt version in manifest
This commit is contained in:
@@ -27,6 +27,8 @@ if (NOT BUILDING_SHS)
|
||||
|
||||
endif()
|
||||
|
||||
set(QT_VERSION "${Qt${SHS_QT_VERSION}_VERSION}")
|
||||
|
||||
set(_shs_shared_libs_ "SHS_shared;SHS_plugins;SHS_builtin;SHS_widgets;SHS_UI_tools;SHS_designer_tools;SHS_script_engine")
|
||||
set(__deps_SHS_builtin "SHS_plugins")
|
||||
set(__deps_SHS_designer_tools "SHS_UI_tools;SHS_builtin")
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
"description": "${PLUGIN_DESCRIPTION}",
|
||||
"version": "${PLUGIN_VERSION}",
|
||||
"version_PIP": "${PIP_VERSION}",
|
||||
"version_Qt": "${QT_VERSION}",
|
||||
"version_QAD": "${QAD_VERSION}",
|
||||
"version_SHS": "${SHS_VERSION}",
|
||||
"build": "${PLUGIN_BUILD}",
|
||||
|
||||
@@ -38,6 +38,7 @@ bool SHPluginManifest::read(const QByteArray & content) {
|
||||
READ_STRING(description);
|
||||
READ_STRING(version);
|
||||
READ_STRING(version_PIP);
|
||||
READ_STRING(version_Qt);
|
||||
READ_STRING(version_QAD);
|
||||
READ_STRING(version_SHS);
|
||||
READ_STRING(build);
|
||||
@@ -84,6 +85,7 @@ bool SHPluginManifest::checkSystem() const {
|
||||
|
||||
bool SHPluginManifest::checkVersions() const {
|
||||
if (!checkVersion(version_PIP, PIP_VERSION_NAME, "PIP")) return false;
|
||||
if (!checkVersion(version_Qt , QT_VERSION_STR , "Qt" )) return false;
|
||||
if (!checkVersion(version_QAD, QAD_VERSION_NAME, "QAD")) return false;
|
||||
if (!checkVersion(version_SHS, SHS_VERSION_NAME, "SHS")) return false;
|
||||
return true;
|
||||
@@ -96,6 +98,7 @@ void SHPluginManifest::fillBuiltin(SHPluginBase * plugin) {
|
||||
arch = SHS_CMAKE_ARCH;
|
||||
timestamp = QDateTime::fromString(SHS_BUILD_DATE, "d.M.yyyy h:m");
|
||||
version_PIP = PIP_VERSION_NAME;
|
||||
version_Qt = QT_VERSION_STR;
|
||||
version_QAD = QAD_VERSION_NAME;
|
||||
version_SHS = SHS_VERSION_NAME;
|
||||
version = plugin->version();
|
||||
|
||||
@@ -35,6 +35,7 @@ public:
|
||||
QString description;
|
||||
QString version;
|
||||
QString version_PIP;
|
||||
QString version_Qt;
|
||||
QString version_QAD;
|
||||
QString version_SHS;
|
||||
QString build;
|
||||
|
||||
Reference in New Issue
Block a user