1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: improve the specialHtmlTargets test

Browse Source 
It can actually be undefined, so test for that before checking
the object type.

This fixes the asyncify build.

Change-Id: I5a6a0bc60c153290c35c20242400c59cd1312403
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
(cherry picked from commit 492b338f570afce3fbadb518bb0b9ab7fdf67e03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Morten Sørvig 2022-06-16 13:12:59 +02:00 committed by Qt Cherry-pick Bot
parent 00d8c8114f
commit c320b61424
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/wasm/qwasmscreen.cpp
View File

@ -172,10 +172,14 @@ std::string QWasmScreen::canvasSpecialHtmlTargetId() const
bool QWasmScreen::hasSpecialHtmlTargets() const
{
static bool gotIt = []{
// specialHTMLTargets is a JavaScript Array if available. Note that it is
// an abort() function if not, so a simple isUndefined() test won't work here.
return emscripten::val::module_property("specialHTMLTargets")
["constructor"]["name"].as<std::string>() == std::string("Array");
// Enable use of specialHTMLTargets, if available
emscripten::val htmlTargets = emscripten::val::module_property("specialHTMLTargets");
if (htmlTargets.isUndefined())
return false;
// Check that the object has the expected type - it can also be
// defined as an abort() function which prints an error on usage.
return htmlTargets["constructor"]["name"].as<std::string>() == std::string("Array");
}();
return gotIt;
}