diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/wasm/qt.prf (renamed from mkspecs/features/html5/qt.prf) | 2 | ||||
| -rw-r--r-- | mkspecs/features/wasm/wasm.prf (renamed from mkspecs/features/html5/html5.prf) | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/features/html5/qt.prf b/mkspecs/features/wasm/qt.prf index 47d616ec90..2f6e3f8c34 100644 --- a/mkspecs/features/html5/qt.prf +++ b/mkspecs/features/wasm/qt.prf @@ -3,7 +3,7 @@ qt_depends = $$resolve_depends(QT, "QT.") !watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) { LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms - lib_name = html5 + 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) diff --git a/mkspecs/features/html5/html5.prf b/mkspecs/features/wasm/wasm.prf index 3e2b8399bb..bea50f98f0 100644 --- a/mkspecs/features/html5/html5.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -41,27 +41,27 @@ contains(TEMPLATE, .*app) { } # Copy hosting html and javascript to the application build directory. - exists($$[QT_INSTALL_PLUGINS]/platforms/html5_shell.html) { + exists($$[QT_INSTALL_PLUGINS]/platforms/wasm_shell.html) { # dont pass this until it's installed somewhere # otherwise makespec test fails during qt configure - HTML5_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/platforms + WASM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/platforms } else { ## internal build. not installed - HTML5_PLUGIN_PATH = $$PWD/../../../src/plugins/platforms/html5 + WASM_PLUGIN_PATH = $$PWD/../../../src/plugins/platforms/wasm } - # Copy/Generate main .html file (e.g. myapp.html) from the html5_shell.html by + # Copy/Generate main .html file (e.g. myapp.html) from the webassembly_shell.html by # replacing the app name placeholder with the actual app name. apphtml.target = $$DESTDIR/$$TARGET_HTML - apphtml.commands += sed -e s/APPNAME/$$TARGET_BASE/g $$quote($$HTML5_PLUGIN_PATH/html5_shell.html) > $$quote($$DESTDIR/$$TARGET_HTML) $$escape_expand(\\n\\t) + apphtml.commands += sed -e s/APPNAME/$$TARGET_BASE/g $$quote($$WASM_PLUGIN_PATH/wasm_shell.html) > $$quote($$DESTDIR/$$TARGET_HTML) $$escape_expand(\\n\\t) # Copy qtloader.js appjs.target = $$DESTDIR/qtloader.js - appjs.commands += $$QMAKE_COPY $$quote($$HTML5_PLUGIN_PATH/qtloader.js) $$quote($$DESTDIR) $$escape_expand(\\n\\t) + appjs.commands += $$QMAKE_COPY $$quote($$WASM_PLUGIN_PATH/qtloader.js) $$quote($$DESTDIR) $$escape_expand(\\n\\t) # Copy qtlogo.svg qtlogo.target = $$DESTDIR/qtlogo.svg - qtlogo.commands += $$QMAKE_COPY $$quote($$HTML5_PLUGIN_PATH/qtlogo.svg) $$quote($$DESTDIR) $$escape_expand(\\n\\t) + qtlogo.commands += $$QMAKE_COPY $$quote($$WASM_PLUGIN_PATH/qtlogo.svg) $$quote($$DESTDIR) $$escape_expand(\\n\\t) QMAKE_EXTRA_TARGETS += apphtml appjs qtlogo POST_TARGETDEPS += $$apphtml.target $$appjs.target $$qtlogo.target |