From 2cbb6ed65c5590ca63c52854659c5e0fa301b655 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Tue, 18 Jul 2023 23:28:10 +0200
Subject: [PATCH] Enable windows qt6 CI

---
 .gitlab-ci.yml | 2 +-
 .kde-ci.yml    | 2 +-
 CMakeLists.txt | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8914a0912..dd46424da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ include:
       - /gitlab-templates/reuse-lint.yml
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
-      # - /gitlab-templates/windows-qt6.yml
+      - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       # - /gitlab-templates/flatpak.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
diff --git a/.kde-ci.yml b/.kde-ci.yml
index 5cf9f51c2..d4380ac00 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -27,10 +27,10 @@ Dependencies:
     'frameworks/qqc2-desktop-style': '@latest-kf6'
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
 - 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
-    'frameworks/kstatusnotifieritem': '@latest-kf6'
 
 - 'on': ['Linux']
   'require':
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd8c28a41..33035cb25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,8 +102,7 @@ set_package_properties(QuotientQt6 PROPERTIES
     PURPOSE "Talk with matrix server"
 )
 
-# The android part is just for CI. We do NOT support any builds without E2EE
-if (NOT TARGET Olm::Olm AND NOT ANDROID)
+if (NOT TARGET Olm::Olm)
     message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
 endif()