From f9b15292171f04bf615619b8ee4fc30f4ef2a856 Mon Sep 17 00:00:00 2001 From: Evgeny Prikazchikov Date: Thu, 19 Feb 2026 21:56:53 +0300 Subject: [PATCH] TLS plugin added --- build/install.qbs | 10 ++++++++++ hub/install/installmodel.cpp | 19 ++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/build/install.qbs b/build/install.qbs index 9d5d3c6..1262bdb 100644 --- a/build/install.qbs +++ b/build/install.qbs @@ -132,6 +132,16 @@ Product { qbs.installPrefix: install.PREFIX } + Group { + name: "Qt TLS Plugins" + prefix: FileInfo.joinPaths(Qt.core.pluginPath, "/tls/") + files: pluginFiles + excludeFiles: pluginExcludeFiles + qbs.install: true + qbs.installDir: install.QTPLUGINS_PATH + "/tls" + qbs.installPrefix: install.PREFIX + } + Group { name: "Qt XCB Integrations Plugins" condition: qbs.targetOS.contains("linux") diff --git a/hub/install/installmodel.cpp b/hub/install/installmodel.cpp index 7041cb6..15f6c43 100644 --- a/hub/install/installmodel.cpp +++ b/hub/install/installmodel.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,19 @@ void Sdk::checkInstalled() { {"macos", "macosx"} }; + if(path.isEmpty()) { + path = Settings::instance()->sdkDir() + "/" + version; +#ifdef Q_OS_WINDOWS + path += "/windows/x86_64/bin/WorldEditor.exe"; +#endif +#ifdef Q_OS_LINUX + path += "/linux/x86_64/bin/WorldEditor"; +#endif +#ifdef Q_OS_MACOS + path += "/macos/arm64/WorldEditor.app/Contents/MacOS/WorldEditor"; +#endif + } + installed = QFileInfo::exists(path); root = QFileInfo(path).path() + "/../../../"; @@ -345,7 +357,7 @@ void InstallModel::updateSdk(const QString &version, const QStringList &modules) if(sdk) { QStringList downloads; for(auto &it : sdk->modules) { - if(modules.contains(it.platform)) { + if(modules.contains(it.platform) || !it.optional) { if(it.installed) { continue; } @@ -354,7 +366,8 @@ void InstallModel::updateSdk(const QString &version, const QStringList &modules) } static const QMap aliases = { - {"webgl", "emscripten"} + {"webgl", "emscripten"}, + {"macosx", "macos"} }; for(auto &it : sdk->modules) { if(!modules.contains(it.platform)) {