Merge branch '1.5' into 1.6

.github/workflows/tests.yml

@@ -78,20 +78,47 @@ jobs:
     runs-on: windows-latest
     env:
       QT_VERSION: ${{ matrix.qt_version }}
+      BUILD_WITH_QT6: ${{ (startsWith(matrix.qt_version, '6.') && 'ON') || 'OFF' }}
     strategy:
       fail-fast: false
       matrix:
-        qt_version: ['5.15.*', '6.*.*']
+        qt_version: ['5.15.*', '6.7.*']
     steps:
       - uses: actions/checkout@v3
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_version }}
+          modules: ${{ (startsWith(matrix.qt_version, '6.') && 'qt5compat') || '' }}
+      - name: Install deps
+        run: |
+          choco install pkgconfiglite
+      - name: Build QCA
+        shell: bash
+        run: |
+          mkdir D:/a/usr
+          git clone https://invent.kde.org/libraries/qca
+          cd qca
+          cmake . -DCMAKE_INSTALL_PREFIX="D:/a/usr" -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=${BUILD_WITH_QT6}
+          cmake --build . --config Release --parallel
+          cmake --install . --config Release
+          cd ..
+      - name: Build libomemo-c
+        run: |
+          git clone https://github.com/dino/libomemo-c
+          cd libomemo-c
+          git checkout v0.5.0
+          cmake . -DCMAKE_INSTALL_PREFIX="D:/a/usr"
+          cmake --build . --config Release --parallel
+          cmake --install . --config Release
+          cd ..
       - name: Run tests
         run: |
+          ${env:PATH} += ";D:/a/usr/bin"
           ${env:PATH} += ";D:/a/qxmpp/qxmpp/src/Debug"
-          cmake . && cmake --build .
+          ${env:PKG_CONFIG_PATH} += ";D:/a/usr/lib/pkgconfig"
+
+          cmake . -DBUILD_OMEMO=ON && cmake --build . --parallel
           # ctest
           # ctest --rerun-failed --output-on-failure