diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
| commit | 3c662bf13cdc509c1f40c59ad30711c909006b06 (patch) | |
| tree | 8d20ff8e1aaf0f15c768e1f289bcabeed449a4cb /src/plugins/platforms/wasm/qwasmcompositor.h | |
| parent | 17790dd030cf05951c6bc886362e5645bb4eb686 (diff) | |
| parent | 2ea3e133c369deefeae0605ad2f32aaea52c9e97 (diff) | |
Merge remote-tracking branch 'origin/5.13.0' into 5.13
Conflicts:
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmintegration.h
Change-Id: Idf4c7936513fb1f21daa8f6105b8545f13447bb8
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmcompositor.h')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmcompositor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h index 3104573073..98f4a79b27 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.h +++ b/src/plugins/platforms/wasm/qwasmcompositor.h @@ -64,6 +64,7 @@ class QWasmCompositor : public QObject public: QWasmCompositor(QWasmScreen *screen); ~QWasmCompositor(); + void destroy(); enum QWasmSubControl { SC_None = 0x00000000, |