diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 14:03:31 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:15:22 +0200 |
| commit | f90c68316c622971706568303a025bbc58351df3 (patch) | |
| tree | 64357377dc4dfc46470c36d9a9a3b62bf7625fb9 /vcl/qt5/Qt5Instance.cxx | |
| parent | 8a4173987edfeeb7e49c70617d43e3adc911d333 (diff) | |
WASM: add Emscripten demo application
Change-Id: I31297142761255b1f357fc9677a644b7a93c921a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111128
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'vcl/qt5/Qt5Instance.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Instance.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index f0c1f56f6690..bf8d52961960 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -54,6 +54,11 @@ #include <mutex> #include <condition_variable> +#ifdef EMSCRIPTEN +#include <QtCore/QtPlugin> +Q_IMPORT_PLUGIN(QWasmIntegrationPlugin) +#endif + namespace { /// TODO: not much Qt5 specific here? could be generalised, esp. for OSX... @@ -427,7 +432,7 @@ OUString Qt5Instance::GetConnectionIdentifier() { return OUString(); } void Qt5Instance::AddToRecentDocumentList(const OUString&, const OUString&, const OUString&) {} -OpenGLContext* Qt5Instance::CreateOpenGLContext() { return new Qt5OpenGLContext; } +OpenGLContext* Qt5Instance::CreateOpenGLContext() { return nullptr; } bool Qt5Instance::IsMainThread() const { @@ -570,7 +575,7 @@ void* Qt5Instance::CreateGStreamerSink(const SystemChildWindow* pWindow) return pVideosink; #else - (void*)pWindow; + Q_UNUSED(pWindow); return nullptr; #endif } |