Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0

Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/mcusupport/mcusupportsdk.h b/src/plugins/mcusupport/mcusupportsdk.h
index 444855b881..1cc2adadc7 100644
--- a/src/plugins/mcusupport/mcusupportsdk.h
+++ b/src/plugins/mcusupport/mcusupportsdk.h
@@ -27,6 +27,10 @@
 
 #include <QVector>
 
+namespace Utils {
+class FilePath;
+}
+
 namespace McuSupport {
 namespace Internal {
 class McuPackage;
@@ -36,9 +40,8 @@ namespace Sdk {
 
 McuPackage *createQtForMCUsPackage();
 
-// Legacy: List of targets supported by Qt for MCUs 1.0
-void hardcodedTargetsAndPackages(const Utils::FilePath &qulDir,
-                                 QVector<McuPackage*> *packages, QVector<McuTarget*> *mcuTargets);
+void targetsAndPackages(const Utils::FilePath &qulDir,
+                        QVector<McuPackage*> *packages, QVector<McuTarget*> *mcuTargets);
 
 } // namespace Sdk
 } // namespace Internal