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

WebAssembly: Use the most recent settings access pattern

Browse Source 
Includes delaying construction until its first actual use.

Change-Id: Ide0f7a12250c2597f45993d6ef0fb604c974a763
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-07-13 18:50:58 +02:00
parent 7a4fa635cf
commit 9567f82b75
4 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ static void addRegisteredMinGWToEnvironment(Environment &env)
void WebAssemblyToolChain::addToEnvironment(Environment &env) const
{
const FilePath emSdk = WebAssemblySettings::instance()->emSdk();
const FilePath emSdk = settings().emSdk();
WebAssemblyEmSdk::addToEnvironment(emSdk, env);
if (env.osType() == OsTypeWindows)
addRegisteredMinGWToEnvironment(env);
@@ -95,7 +95,7 @@ const QVersionNumber &WebAssemblyToolChain::minimumSupportedEmSdkVersion()
static Toolchains doAutoDetect(const ToolchainDetector &detector)
{
const FilePath sdk = WebAssemblySettings::instance()->emSdk();
const FilePath sdk = settings().emSdk();
if (!WebAssemblyEmSdk::isValid(sdk))
return {};