From 86db69b3418494223d28f64a7a460af10a89b8dd Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Mon, 13 Sep 2021 23:32:56 +0200
Subject: re-enable qt5-activeqt (#20083)

* remove qt5-activeqt from baseline

* add colmap as baseline fail
---
 scripts/ci.baseline.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 73ed5b003..f3ee0b4f5 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -147,6 +147,7 @@ cmcstl2:x86-windows        = skip
 coin:arm64-windows=fail
 coin:arm-uwp=fail
 coin:x64-uwp=fail
+colmap:x64-windows-static=fail
 concurrencpp:x64-linux=fail
 concurrencpp:x64-osx=fail
 constexpr-contracts:x64-linux=fail
@@ -1282,14 +1283,6 @@ qt5-x11extras:x86-windows=fail
 qt5-x11extras:x64-windows=fail
 qt5-x11extras:x64-windows-static=fail
 qt5-x11extras:x64-windows-static-md=fail
-# Conflicts with qt5-declarative, see https://github.com/microsoft/vcpkg/issues/19922
-qt5-activeqt:arm-uwp=skip
-qt5-activeqt:arm64-windows=skip
-qt5-activeqt:x64-uwp=skip
-qt5-activeqt:x64-windows-static-md=skip
-qt5-activeqt:x64-windows-static=skip
-qt5-activeqt:x64-windows=skip
-qt5-activeqt:x86-windows=skip
 quickfix:arm-uwp=fail
 quickfix:arm64-windows=fail
 quickfix:x64-uwp=fail
-- 
cgit v1.2.3