diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2019-06-05 11:04:14 +0000 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2019-07-09 13:49:18 +0200 |
| commit | 17ac9f8ced6ed351b52966739558abf9e44e1069 (patch) | |
| tree | c1d3ca77f8f84ad1234fa5586ac716bec9450b5e /mkspecs | |
| parent | e6c646a67858f98a255e80994e5920e932298164 (diff) | |
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 <edward.welbourne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/unsupported/testserver.prf | 4 |
1 files changed, 2 insertions, 2 deletions
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 = "" |