diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
| commit | 60a2c3e453177389c0dfbca9211fa2918755124d (patch) | |
| tree | 0f329b8ae854fa1a17be31a4653bb4b76af46f86 /src/quick/scenegraph/qsgdefaultrendercontext.cpp | |
| parent | bbc52bcbb6391c4925df26672eb1f26040c6f67c (diff) | |
| parent | fa74444ed06e4db21b0e9829a5832b886b39d372 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
tools/qmlscene/main.cpp
Change-Id: Idd6e05582ade4def1a3907f9622a8e132bec6bf7
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrendercontext.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultrendercontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp index 22e97a2dc9..73b79c6300 100644 --- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp +++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp @@ -325,7 +325,8 @@ bool QSGDefaultRenderContext::separateIndexBuffer() const // lifetime. An attempt to bind a buffer object to the other // target will generate an INVALID_OPERATION error, and the // current binding will remain untouched. - static const bool isWebGL = qGuiApp->platformName().compare(QLatin1String("webgl")) == 0; + static const bool isWebGL = (qGuiApp->platformName().compare(QLatin1String("webgl")) == 0 + || qGuiApp->platformName().compare(QLatin1String("wasm")) == 0); return isWebGL; } |