diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py
index 1e8da4d..73b1f3f 100644
--- a/ci/generate_azure_pipelines_matrices.py
+++ b/ci/generate_azure_pipelines_matrices.py
@@ -275,9 +275,17 @@ mac_build_jobs.extend(
 linux_build_jobs.append(
     BuildJob("install-qt", "5.14.2", "linux", "desktop", "wasm_32", "wasm_32")
 )
+linux_build_jobs.append(
+    BuildJob("install-qt", "6.4.0", "linux", "desktop", "wasm_32", "wasm_32",
+             is_autodesktop=True, emsdk_version="sdk-3.1.14-64bit", autodesk_arch_folder="gcc_64")
+)
 mac_build_jobs.append(
     BuildJob("install-qt", "5.14.2", "mac", "desktop", "wasm_32", "wasm_32")
 )
+mac_build_jobs.append(
+    BuildJob("install-qt", "6.4.0", "mac", "desktop", "wasm_32", "wasm_32",
+             is_autodesktop=True, emsdk_version="sdk-3.1.14-64bit", autodesk_arch_folder="clang_64")
+)
 windows_build_jobs.append(
     BuildJob("install-qt", "5.14.2", "windows", "desktop", "wasm_32", "wasm_32")
 )
diff --git a/ci/openglwindow_qt6.7z b/ci/openglwindow_qt6.7z
new file mode 100644
index 0000000..332a8f2
Binary files /dev/null and b/ci/openglwindow_qt6.7z differ
diff --git a/ci/steps.yml b/ci/steps.yml
index 04e94ac..1e861d0 100644
--- a/ci/steps.yml
+++ b/ci/steps.yml
@@ -334,7 +334,12 @@ steps:
       ./emsdk activate --embedded $(EMSDK_VERSION)
       source $(Build.BinariesDirectory)/emsdk/emsdk_env.sh
       mkdir $(Build.BinariesDirectory)/tests
-      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/openglwindow.7z)
+      if [[ $(QT_VERSION) = 6* ]]; then
+        OPENGLWINDOW_7Z="openglwindow_qt6.7z"
+      else
+        OPENGLWINDOW_7Z="openglwindow.7z"
+      fi
+      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/$OPENGLWINDOW_7Z)
       export PATH=$(QT_BINDIR):$PATH
       qmake $(Build.BinariesDirectory)/tests/openglwindow
       make
@@ -358,16 +363,15 @@ steps:
       .\emsdk_env.bat
       mkdir $(Build.BinariesDirectory)\tests
       cd $(Build.BinariesDirectory)\tests
-      7z x $(Build.SourcesDirectory)\ci\openglwindow.7z
       $env:Path += ";$(WIN_QT_BINDIR)"
       echo "Add Qt/qmake to PATH at $(WIN_QT_BINDIR):" 
       echo "$env:Path"
-      if('$(QT_VERSION)' -like '6*') {
-        #qmake.bat $(Build.BinariesDirectory)\tests\openglwindow
-        # inline qmake.bat file:
+      if ('$(QT_VERSION)' -like '6*') {
+        7z x $(Build.SourcesDirectory)\ci\openglwindow_qt6.7z
         echo "Inlined qmake.bat command is: $(WIN_AUTODESK_QT_BINDIR)\qmake -qtconf $(WIN_QT_BINDIR)\target_qt.conf $(Build.BinariesDirectory)\tests\openglwindow"
         $(WIN_AUTODESK_QT_BINDIR)\qmake.exe -qtconf "$(WIN_QT_BINDIR)\target_qt.conf" $(Build.BinariesDirectory)\tests\openglwindow
       } else {
+        7z x $(Build.SourcesDirectory)\ci\openglwindow.7z
         echo "Qt5: run qmake.exe"
         qmake $(Build.BinariesDirectory)\tests\openglwindow
       }