feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mcu: Extend workaround for missing JSON file for Desktop target to Linux

Browse Source 
Amends 08fe165ab586e6.

Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62
Reviewed-by: Jacek Nijaki <jacek.nijaki@siili.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-08-20 16:18:21 +02:00
parent 2e0e0df290
commit bedf7d74a4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/mcusupport/mcusupportsdk.cpp
View File

@@ -488,7 +488,13 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *> *packa
} }
// Workaround for missing JSON file for Desktop target: // 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; McuTargetDescription desktopDescription;
desktopDescription.qulVersion = descriptions.empty() ? desktopDescription.qulVersion = descriptions.empty() ?
McuSupportOptions::minimalQulVersion().toString() McuSupportOptions::minimalQulVersion().toString()