From bedf7d74a4af721c41a20e5c22d84bbf647e2e45 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 20 Aug 2020 16:18:21 +0200 Subject: [PATCH] Mcu: Extend workaround for missing JSON file for Desktop target to Linux Amends 08fe165ab586e6. Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62 Reviewed-by: Jacek Nijaki Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportsdk.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index ad6dd1418b6..7af61105799 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -488,7 +488,13 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector *packa } // Workaround for missing JSON file for Desktop target: - if (dir.pathAppended("/lib/QulQuickUltralite_QT_32bpp_Windows_Release.lib").exists()) { + Utils::FilePath desktopLib; + if (Utils::HostOsInfo::isWindowsHost()) + desktopLib = dir / "lib/QulQuickUltralite_QT_32bpp_Windows_Release.lib"; + else + desktopLib = dir / "lib/libQulQuickUltralite_QT_32bpp_Linux_Debug.a"; + + if (desktopLib.exists()) { McuTargetDescription desktopDescription; desktopDescription.qulVersion = descriptions.empty() ? McuSupportOptions::minimalQulVersion().toString()