wasm: fix qpa plugin build system integration

fix the plugin name (it was missing the leading 'q') and the name used in configure (the latter making it unnecessary to mess with it in the mkspec). the qt.prf override which forced linkage of the plugin is also removed due to being completely redundant. Change-Id: I94687a34a295c36754e36a298af902b656ba2ecc Reviewed-by: Kyle Edwards <[email protected]> Reviewed-by: Lorn Potter <[email protected]>
StrataSource · Nov 21, 2018 · 54dabdd · 54dabdd
1 parent f5f46aa
commit 54dabdd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/mkspecs/features/wasm/qt.prf b/mkspecs/features/wasm/qt.prf
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf
@@ -75,7 +75,4 @@ QMAKE_EXTENSION_STATICLIB = a      # llvm bitcode
 QMAKE_AR                = emar cqs
 QMAKE_DISTCLEAN            += *.html *.js *.wasm
 
-QT_QPA_DEFAULT_PLATFORM = wasm
-
-QTPLUGIN.platforms = wasm
 load(qt_config)
diff --git a/src/gui/configure.pri b/src/gui/configure.pri
@@ -55,7 +55,7 @@ defineTest(qtConfTest_qpaDefaultPlatform) {
     else: qnx: name = qnx
     else: integrity: name = integrityfb
     else: haiku: name = haiku
-    else: wasm: name = webassembly
+    else: wasm: name = wasm
     else: name = xcb
 
     $${1}.value = $$name

diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro
@@ -1,4 +1,4 @@
-TARGET = wasm
+TARGET = qwasm
 CONFIG += static plugin
 QT += \
     core-private gui-private \