1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: fix qpa plugin build system integration

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2018-10-29 17:04:38 +01:00
parent f5f46aaf42
commit 54dabdd1e8
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkspecs/features/wasm/qt.prf
View File

@ -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)

3
mkspecs/wasm-emscripten/qmake.conf
View File

@ -75,7 +75,4 @@ QMAKE_EXTENSION_STATICLIB = a # llvm bitcode
QMAKE_AR = emar cqs QMAKE_AR = emar cqs
QMAKE_DISTCLEAN += *.html *.js *.wasm QMAKE_DISTCLEAN += *.html *.js *.wasm
QT_QPA_DEFAULT_PLATFORM = wasm
QTPLUGIN.platforms = wasm
load(qt_config) load(qt_config)

2
src/gui/configure.pri
View File

@ -55,7 +55,7 @@ defineTest(qtConfTest_qpaDefaultPlatform) {
else: qnx: name = qnx else: qnx: name = qnx
else: integrity: name = integrityfb else: integrity: name = integrityfb
else: haiku: name = haiku else: haiku: name = haiku
else: wasm: name = webassembly else: wasm: name = wasm
else: name = xcb else: name = xcb
$${1}.value = $$name $${1}.value = $$name

2
src/plugins/platforms/wasm/wasm.pro
View File

@ -1,4 +1,4 @@
TARGET = wasm TARGET = qwasm
CONFIG += static plugin CONFIG += static plugin
QT += \ QT += \
core-private gui-private \ core-private gui-private \