diff options
| author | hjk <hjk@qt.io> | 2020-08-20 16:18:21 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-08-20 15:03:37 +0000 |
| commit | bedf7d74a4af721c41a20e5c22d84bbf647e2e45 (patch) | |
| tree | 8e58424f053c2a22540eb1a13d8b66b17c7b7560 | |
| parent | 2e0e0df290410ad2aaceb2d1aaa205d35600bd85 (diff) | |
Mcu: Extend workaround for missing JSON file for Desktop target to Linux
Amends 08fe165ab586e6.
Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62
Reviewed-by: Jacek Nijaki <jacek.nijaki@siili.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcusupportsdk.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index ad6dd1418b..7af6110579 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -488,7 +488,13 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *> *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() |