feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

WebAssembly: Base Settings handling on Core::PagedSettings

Browse Source 
Change-Id: If28afd8046367eb1b8b12e54d2dae4235dbc821f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2023-05-17 16:10:10 +02:00
parent 7501d7587f
commit 5acecd4ef9
11 changed files with 216 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/webassembly/webassemblytoolchain.cpp
View File

@@ -1,9 +1,11 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "webassemblytoolchain.h"
#include "webassemblyconstants.h"
#include "webassemblyemsdk.h"
#include "webassemblytoolchain.h"
#include "webassemblysettings.h"
#include "webassemblytr.h"
#include <projectexplorer/devicesupport/devicemanager.h>
@@ -49,7 +51,8 @@ static void addRegisteredMinGWToEnvironment(Environment &env)
void WebAssemblyToolChain::addToEnvironment(Environment &env) const
{
WebAssemblyEmSdk::addToEnvironment(WebAssemblyEmSdk::registeredEmSdk(), env);
const FilePath emSdk = WebAssemblySettings::instance()->emSdk();
WebAssemblyEmSdk::addToEnvironment(emSdk, env);
if (env.osType() == OsTypeWindows)
addRegisteredMinGWToEnvironment(env);
}
@@ -92,7 +95,7 @@ const QVersionNumber &WebAssemblyToolChain::minimumSupportedEmSdkVersion()
static Toolchains doAutoDetect(const ToolchainDetector &detector)
{
const FilePath sdk = WebAssemblyEmSdk::registeredEmSdk();
const FilePath sdk = WebAssemblySettings::instance()->emSdk();
if (!WebAssemblyEmSdk::isValid(sdk))
return {};