diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
| commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
| tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /src/tools/androidtestrunner | |
| parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
| parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'src/tools/androidtestrunner')
| -rw-r--r-- | src/tools/androidtestrunner/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index 18c4a680be..3e82fded67 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -280,7 +280,7 @@ static void printHelp() " $PATH will be used.\n" " --activity <acitvity>: The Activity to run. If missing the first\n" " activity from AndroidManifest.qml file will be used.\n" - " --timout <seconds>: Timeout to run the test.\n" + " --timeout <seconds>: Timeout to run the test.\n" " Default is 5 minutes.\n" " --make <make cmd>: make command, needed to install the qt library.\n" " If make is missing make sure the --path is set.\n" |