From 54dabdd1e831491359e85fae444ab3ec700a0d2b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 29 Oct 2018 17:04:38 +0100
Subject: [PATCH] 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 <kyle.edwards@kitware.com>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
---
 mkspecs/features/wasm/qt.prf        | 12 ------------
 mkspecs/wasm-emscripten/qmake.conf  |  3 ---
 src/gui/configure.pri               |  2 +-
 src/plugins/platforms/wasm/wasm.pro |  2 +-
 4 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 mkspecs/features/wasm/qt.prf

diff --git a/mkspecs/features/wasm/qt.prf b/mkspecs/features/wasm/qt.prf
deleted file mode 100644
index 9b9b58d3dee..00000000000
--- a/mkspecs/features/wasm/qt.prf
+++ /dev/null
@@ -1,12 +0,0 @@
-
-qt_depends = $$resolve_depends(QT, "QT.")
-equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) {
-    LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms
-
-    lib_name = wasm
-    lib_path_and_base = $$[QT_INSTALL_PLUGINS/get]/platforms/lib$${lib_name}$$qtPlatformTargetSuffix()
-    LIBS += -l$${lib_name}$$qtPlatformTargetSuffix() $$fromfile($${lib_path_and_base}.prl, QMAKE_PRL_LIBS)
-}
-
-load(qt)
-
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf
index 7090fa65dcc..2539770b51e 100644
--- 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
index 2971fd136e8..e21489ec286 100644
--- 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
index f1205702ef8..eaaba53aa2e 100644
--- 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 \