diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2020-06-30 18:07:41 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2020-07-02 06:44:57 +0000 |
| commit | 349e525031652b65f4894f9e752546cfac805afd (patch) | |
| tree | 9359b170c2b50581075b7068254d4db570bd62ad | |
| parent | f5f684a609cc802335456dad3868ac874008a2e1 (diff) | |
| download | qt-creator-349e525031652b65f4894f9e752546cfac805afd.tar.gz | |
McuSupport: Skip Renesas' "RGL" board SDK
ghs-renesas-rh850-d1m1a.json lists "boardSdk/envVar": "RGL_DIR".
However, that dependency is already handled as vendorSdk. This and the
other board SDKs differ so much, that we simply keep "RGL" as vendorSdk
and skip it when creating board SDKs.
Amends c43ef81d4f59c07b580a8c95335ed9cc6fa7955d
Task-number: QTCREATORBUG-24201
Change-Id: I052d50f413ecc5f318d4146c207ab690acf1b1f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcusupportsdk.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 7509fefba3..143dad05ad 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -280,7 +280,8 @@ static QVector<McuTarget *> targetsFromDescriptions(const QList<McuTargetDescrip QVector<McuPackage*> required3rdPartyPkgs = { vendorPkgs.value(desc.platformVendor), tcPkg }; - if (!desc.boardSdkEnvVar.isEmpty()) { + if (!desc.boardSdkEnvVar.isEmpty() + && desc.boardSdkEnvVar != "RGL_DIR") { // Already included in vendorPkgs if (!boardSdkPkgs.contains(desc.boardSdkEnvVar)) { auto boardSdkPkg = createBoardSdkPackage(desc.boardSdkEnvVar); boardSdkPkgs.insert(desc.boardSdkEnvVar, boardSdkPkg); |