diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-02-12 16:20:36 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-03-22 15:55:18 +0000 |
| commit | e8bde992e073072e795cdb2d4fa5d36089953645 (patch) | |
| tree | 219450d93c193d92bfa7dfd8cddf955babb43f56 /src/corelib/kernel/qeventdispatcher_win.cpp | |
| parent | b43988ada2b107258833deb8fa229f1f142d3851 (diff) | |
Update handling of TESTSERVER_COMPOSE_FILE
Initially TESTSERVER_COMPOSE_FILE could be manually specified.
Later this got removed by accident. Re-enable this feature.
Furthermore, check if a module has a platform-specific compose file. If
not, fall back to a default docker-compose.yml. This is useful to
include testserver.pri from other modules, where no platform-specific
requirements are present, ie the image from provisioning works on all
platforms.
Change-Id: Icb92552fd61196be332b2431ab0f8a43b9157fc8
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_win.cpp')
0 files changed, 0 insertions, 0 deletions