Add Qt 5.15-em1.39.10 with threads

README.md

@@ -8,7 +8,16 @@ This container is based on [trzeci/emscripten](https://github.com/trzecieu/emscr
 The [concourse pipeline](https://concourse.madmanfred.com/teams/main/pipelines/qt-webassembly) is constantly building images and putting them on dockerhub [madmanfred/qt-webassembly](https://hub.docker.com/repository/docker/madmanfred/qt-webassembly).
 
 ## Usage ##
-docker run --rm -v $(pwd):/src/ -u $(id -u):$(id -g) madmanfred/qt-webassembly qmake && make
+### bash ###
+```Shell
+docker run --rm -v $(pwd):/src/ -u $(id -u):$(id -g) madmanfred/qt-webassembly qmake
+docker run --rm -v $(pwd):/src/ -u $(id -u):$(id -g) madmanfred/qt-webassembly make
+```
+### powershell ###
+```PowerShell
+docker run --rm -v $(PWD):/src/ madmanfred/qt-webassembly qmake
+docker run --rm -v $(PWD):/src/ madmanfred/qt-webassembly make
+```
 
 ## Build status ##
 [<p align="center"><img src="https://images.madmanfred.com/qt-webassembly-status.jpg"></p>](https://concourse.einhorn.jetzt/teams/main/pipelines/qt-webassembly)
@@ -17,7 +26,7 @@ docker run --rm -v $(pwd):/src/ -u $(id -u):$(id -g) madmanfred/qt-webassembly q
 Here are some tips to speed up your builds for Qt for WebAssembly:
 
 - You can add this to use a local directory as cache:
-  ```
+  ```Shell
   -v ~/.emscripten_cache:/emsdk_portable/.data/cache
   ```
 
@@ -26,7 +35,7 @@ Here are some tips to speed up your builds for Qt for WebAssembly:
 - You can also increase the compilation speed a bit by using a parallel build (`make -j`).
 
 - If you disable all optimizations you can reduce your build time significantly. Just add this to your project file:
-  ```
+  ```QMake
   QMAKE_CXXFLAGS_RELEASE -= -O3
   QMAKE_CXXFLAGS_RELEASE *= -O0
 

qt-pipeline.yml

@@ -151,6 +151,13 @@ resources:
       username: ((registry_username))
       password: ((registry_password))
       tag: qt5.15-em1.39.10
+  - name: qt-webassembly-qt5.15-em1.39.10-threads
+    type: registry-image
+    source:
+      repository: ((registry_username))/qt-webassembly
+      username: ((registry_username))
+      password: ((registry_password))
+      tag: qt5.15-em1.39.10-multithreading
   - name: emscripten-1-38-16
     type: registry-image
     source:
@@ -905,6 +912,48 @@ jobs:
                build
       - put: qt-webassembly-qt5.15-em1.39.10
         params: {image: image/image.tar}
+  - name: build-qt5.15-em1.39.10-threads
+    public: true
+    serial_groups: [build-qt]
+    plan:
+      - get: qt-webassembly-docker
+#        trigger: true
+      - get: emscripten-1-39-10
+        params:
+          format: oci
+        trigger: true
+      - get: qt5-15
+        trigger: true
+      - get: oci-build-task
+      - task: build-qt-webassembly-qt5.15-em1.39.10-threads
+        privileged: true
+        image: oci-build-task
+        config:
+          platform: linux
+          params:
+            DOCKERFILE: ./qt-webassembly-docker/Dockerfile
+            BUILD_ARG_QT_DIRECTORY: qt/
+            BUILD_ARG_QT_CONFIGURE_OPTIONS: -feature-thread
+            BUILD_ARG_QT_MODULES: module-qtgraphicaleffects module-qtcharts module-qtsvg module-qtwebsockets module-qtxmlpatterns module-qtquickcontrols2
+          inputs:
+          - name: qt-webassembly-docker
+          - name: emscripten-1-39-10
+            path: emscripten/
+          - name: qt5-15
+            path: qt/
+          outputs:
+          - name: image
+          caches:
+          - path: cache
+          run:
+            path: sh
+            args:
+             - -ceux
+             - |
+               export BUILD_ARG_EMSCRIPTEN_BASE="trzeci/emscripten@$(cat emscripten/digest)"
+               build
+      - put: qt-webassembly-qt5.15-em1.39.10-threads
+        params: {image: image/image.tar}
 
 groups:
 
@@ -927,6 +976,7 @@ groups:
   - build-qt5.15-em1.39.4
   - build-qt5.15-em1.39.7
   - build-qt5.15-em1.39.10
+  - build-qt5.15-em1.39.10-threads
 - name: qt5-12
   jobs:
   - build-qt5.12-em1.38.16
@@ -952,3 +1002,4 @@ groups:
   - build-qt5.15-em1.39.4
   - build-qt5.15-em1.39.7
   - build-qt5.15-em1.39.10
+  - build-qt5.15-em1.39.10-threads