From 4ded73583d1ba2f74f47a4fc4b203f659bee251b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 7 Jun 2022 14:08:37 +0200 Subject: [PATCH] DeviceShell: Fix compile issues - fix warning deviceshell.cpp:222:59: warning: suggest braces around initialization of subobject - add missing dependency to app_version to tests Change-Id: I6d61f26cbc6f51b28175257ab7d0f4d2b491fecb Reviewed-by: Marcus Tillmanns Reviewed-by: Jarek Kobus Reviewed-by: --- src/libs/utils/deviceshell.cpp | 2 +- tests/auto/utils/deviceshell/CMakeLists.txt | 2 +- tests/manual/deviceshell/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/deviceshell.cpp b/src/libs/utils/deviceshell.cpp index da8dc1a02d4..2b7b912541b 100644 --- a/src/libs/utils/deviceshell.cpp +++ b/src/libs/utils/deviceshell.cpp @@ -219,7 +219,7 @@ DeviceShell::RunResult DeviceShell::run(const CommandLine &cmd, const QByteArray QWaitCondition waiter; const int id = ++m_currentId; - const auto it = m_commandOutput.insert(id, CommandRun{-1, {}, {}, &waiter}); + const auto it = m_commandOutput.insert(id, CommandRun{{-1, {}, {}}, &waiter}); QMetaObject::invokeMethod(m_shellProcess, [this, id, &cmd, &stdInData]() { const QString command = QString("%1 \"%2\" %3\n") diff --git a/tests/auto/utils/deviceshell/CMakeLists.txt b/tests/auto/utils/deviceshell/CMakeLists.txt index 61492bef322..e9b52c4ad82 100644 --- a/tests/auto/utils/deviceshell/CMakeLists.txt +++ b/tests/auto/utils/deviceshell/CMakeLists.txt @@ -3,6 +3,6 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L add_qtc_test(tst_utils_deviceshell DEFINES "TEST_RELATIVE_LIBEXEC_PATH=\"${TEST_RELATIVE_LIBEXEC_PATH}\"" - DEPENDS Utils + DEPENDS Utils app_version SOURCES tst_deviceshell.cpp ) diff --git a/tests/manual/deviceshell/CMakeLists.txt b/tests/manual/deviceshell/CMakeLists.txt index 39616223488..26671f7e4f8 100644 --- a/tests/manual/deviceshell/CMakeLists.txt +++ b/tests/manual/deviceshell/CMakeLists.txt @@ -4,7 +4,7 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L add_qtc_test(tst_manual_deviceshell MANUALTEST DEFINES "TEST_RELATIVE_LIBEXEC_PATH=\"${TEST_RELATIVE_LIBEXEC_PATH}\"" - DEPENDS Utils + DEPENDS Utils app_version SOURCES tst_deviceshell.cpp )