diff --git a/azure-pipelines-windows-template-qt6.yml b/azure-pipelines-windows-template-qt6.yml
new file mode 100644
index 00000000..e6a7ffc5
--- /dev/null
+++ b/azure-pipelines-windows-template-qt6.yml
@@ -0,0 +1,51 @@
+parameters:
+  name: Windows_x64
+  architecture: 'x64'
+  qt_version: '6.2.2'
+  qt_spec: 'msvc2019_64'
+  qt_aqt_spec: 'win64_msvc2019_64'
+  vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
+  vc_redist_file_name: 'vc_redist.x64.exe'
+  vc_vars: 'vcvars64.bat'
+
+jobs:
+- job: ${{ parameters.name }}
+  dependsOn: CodeFormatValidation
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - script: |
+      pip install aqtinstall
+      mkdir C:\Qt
+      python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }}
+      dir C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
+      choco install -y wget
+      choco install innosetup
+      wget "https://sourceforge.net/projects/sevenzip/files/7-Zip/18.05/7z1805-src.7z" -P $(Build.SourcesDirectory)\compressed_archive
+      7z x $(Build.SourcesDirectory)\compressed_archive\7z1805-src.7z -o$(Build.SourcesDirectory)\compressed_archive\lib7zip
+      wget "${{ parameters.vc_redist_url }}" -O $(Build.SourcesDirectory)\${{ parameters.vc_redist_file_name }}
+    displayName: 'Install dependencies'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}"
+      set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
+      set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
+      qmake CONFIG+="7zip" %DEFINES_VAR%
+      nmake
+    displayName: 'Build'
+#  - script: |
+#      set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
+#      cd $(Build.SourcesDirectory)\ci\win
+#      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber)
+#    displayName: 'Create installer'
+#  - task: CopyFiles@2
+#    inputs:
+#      sourceFolder: $(Build.SourcesDirectory)\ci\win\Output\
+#      contents: '*'
+#      targetFolder: $(Build.ArtifactStagingDirectory)
+#  - task: PublishPipelineArtifact@1
+#    inputs:
+#      path: $(Build.ArtifactStagingDirectory)
+#      artifactName: Windows ${{ parameters.architecture }} $(Build.BuildNumber) 7z Installer
+
+
+
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6bd855e4..5a3727a0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -141,6 +141,21 @@ jobs:
     vc_redist_file_name: 'vc_redist.x64.exe'
     vc_vars: 'vcvars64.bat'
 
+#
+# Windows x64 qt6
+#
+
+- template: azure-pipelines-windows-template-qt6.yml
+  parameters:
+    name: Windows_x64_qt6
+    architecture: 'x64'
+    qt_version: '6.2.2'
+    qt_spec: 'msvc2019_64'
+    qt_aqt_spec: 'win64_msvc2019_64'
+    vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
+    vc_redist_file_name: 'vc_redist.x64.exe'
+    vc_vars: 'vcvars64.bat'
+
 #
 # Windows x86
 #
@@ -167,6 +182,7 @@ jobs:
     - MacOS
     - Windows_x86
     - Windows_x64
+    - Windows_x64_qt6
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), true)
     variables:
     - group: github-releases
@@ -205,6 +221,7 @@ jobs:
     - MacOS
     - Windows_x86
     - Windows_x64
+    - Windows_x64_qt6
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     variables:
     - group: github-releases