diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:27 +0200 |
| commit | dd0cd711708f65c429f807f42456bff14404f9c0 (patch) | |
| tree | 14687b4d9bb0b0d2a3b0b8ad6143fa2585a7597f /src/tools/androidtestrunner/main.cpp | |
| parent | ed48391c592e8ba68c723e3017ac384f0c7a7c23 (diff) | |
| parent | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/tools/androidtestrunner/main.cpp')
| -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 f61d407d4a..1046c7b7ef 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -277,7 +277,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" |