From b3dfcfd3b74334221c4516c414e3118af39bdc51 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 11 May 2022 11:19:46 +0200 Subject: [PATCH] McuSupport: Fix compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - override missing for mock methods - remove unused variable Change-Id: If703b60dece417fc7dc004d67966f2b6b8281990 Reviewed-by: Piotr Mućko Reviewed-by: Alessandro Portale Reviewed-by: Qt CI Bot --- src/plugins/mcusupport/test/settingshandlermock.h | 4 ++-- src/plugins/mcusupport/test/unittest.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/mcusupport/test/settingshandlermock.h b/src/plugins/mcusupport/test/settingshandlermock.h index f63f87aad5e..ac48dd04dd2 100644 --- a/src/plugins/mcusupport/test/settingshandlermock.h +++ b/src/plugins/mcusupport/test/settingshandlermock.h @@ -39,10 +39,10 @@ public: MOCK_METHOD(Utils::FilePath, getPath, (const QString &, QSettings::Scope, const Utils::FilePath &), - (const)); + (const, override)); MOCK_METHOD(bool, write, (const QString &, const Utils::FilePath &, const Utils::FilePath &), - (const)); + (const, override)); }; //class SettingsHandler } // namespace McuSupport::Internal diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 4e18b4576fd..0c5cb38dacb 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -106,7 +106,6 @@ const char unsupported[]{"unsupported"}; const char vendor[]{"target_vendor"}; const QString settingsPrefix = QLatin1String(Constants::SETTINGS_GROUP) + '/' + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX); -const char qmlToCppSuffixPath[]{"bin/qmltocpp"}; const QString unsupportedToolchainFilePath = QString{qtForMcuSdkPath} + "/lib/cmake/Qul/toolchain/unsupported.cmake";