diff options
Diffstat (limited to 'src/tools/androidtestrunner')
| -rw-r--r-- | src/tools/androidtestrunner/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/tools/androidtestrunner/main.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index 9f6eb600bc..c53b9125ca 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -4,7 +4,10 @@ ## androidtestrunner App: ##################################################################### -qt_internal_add_app(androidtestrunner +qt_get_tool_target_name(target_name androidtestrunner) +qt_internal_add_tool(${target_name} + TARGET_DESCRIPTION "Qt Android Test Runner Tool" + TOOLS_TARGET Core SOURCES main.cpp DEFINES @@ -14,7 +17,7 @@ qt_internal_add_app(androidtestrunner PUBLIC_LIBRARIES Qt::Gui ) -set_target_properties(androidtestrunner PROPERTIES +set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) @@ -24,7 +27,7 @@ set_target_properties(androidtestrunner PROPERTIES ## Scopes: ##################################################################### -qt_internal_extend_target(androidtestrunner CONDITION windows +qt_internal_extend_target(${target_name} CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index 2e44ff61c8..3e59148cff 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -389,7 +389,7 @@ static bool isRunning() { return false; } - return output.indexOf(" " + g_options.package.toUtf8()) > -1; + return output.indexOf(QLatin1String(" " + g_options.package.toUtf8())) > -1; } static bool waitToFinish() |