From 17ac9f8ced6ed351b52966739558abf9e44e1069 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Wed, 5 Jun 2019 11:04:14 +0000 Subject: Revert "Disable Docker-based test servers on Windows temporarily" This reverts commit 17512d497d7eaf01aefe8140f5010818c0103a95. Reason for revert: force vmx instructions to Coin level B virtual Relates to qt/qt5 84ff024609e4eca003c604294b4102e73deba8c3 Change-Id: Id87a5629a5cd6ebc18c676eae390466e280fc600 Reviewed-by: Edward Welbourne --- mkspecs/features/unsupported/testserver.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/unsupported/testserver.prf') diff --git a/mkspecs/features/unsupported/testserver.prf b/mkspecs/features/unsupported/testserver.prf index 32bd4df30c..bca88ea2d8 100644 --- a/mkspecs/features/unsupported/testserver.prf +++ b/mkspecs/features/unsupported/testserver.prf @@ -58,9 +58,9 @@ debug_and_release:!build_pass: return() DOCKER_ENABLED = 1 -equals(QMAKE_HOST.os, Darwin) | equals(QMAKE_HOST.os, Windows) { +equals(QMAKE_HOST.os, Darwin) { DOCKER_ENABLED = 0 - message("Not using docker network test server on macOS and Windows, see QTQAINFRA-2717 and QTQAINFRA-2750") + message("Not using docker network test server on macOS, see QTQAINFRA-2717 and QTQAINFRA-2750") } TESTSERVER_VERSION = "" -- cgit v1.2.3