Skip to content

Tls plugin added #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Feb 20, 2026
Merged

Tls plugin added #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions build/install.qbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
19 changes: 16 additions & 3 deletions hub/install/installmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <QSettings>
#include <QFileInfo>
#include <QDir>
#include <QImage>
#include <QFileDialog>
#include <QProcess>
#include <QDirIterator>
Expand Down Expand Up @@ -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() + "/../../../";

Expand Down Expand Up @@ -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;
}
Expand All @@ -354,7 +366,8 @@ void InstallModel::updateSdk(const QString &version, const QStringList &modules)
}

static const QMap<QString, QString> aliases = {
{"webgl", "emscripten"}
{"webgl", "emscripten"},
{"macosx", "macos"}
};
for(auto &it : sdk->modules) {
if(!modules.contains(it.platform)) {
Expand Down