diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
| commit | 6f357f50b4b72e3c5a6903a09624ade1d72d12c1 (patch) | |
| tree | a7c39b76c99f4887dbc6837be3a41afc7fdb29b4 /mkspecs/features/unsupported | |
| parent | 7301e44161d8bb25410219a31405584c9492b83e (diff) | |
| parent | 3183e428a95c95e5047dd12fbf2b6388aa7698fb (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: Ib719a6249069e6bd6c9311bbec7f364855ab82ff
Diffstat (limited to 'mkspecs/features/unsupported')
| -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 = "" |