Skip to content

Commit

Permalink
Correctly parse escaped linker flags in addons for QTCreator. (#6323)
Browse files Browse the repository at this point in the history
#changelog #qtcreator
  • Loading branch information
bakercp authored and arturoc committed Jun 28, 2019
1 parent 79dbcfb commit 76deadb
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,10 @@ Module{
for(var addon in allAddons){
var addonPath = allAddons[addon];
config_ldflags = config_ldflags.concat(Helpers.parseAddonConfig(addonPath, "ADDON_LDFLAGS", [], platform))

// Remove linker escapes https://doc.qt.io/qbs/qml-qbsmodules-cpp.html#linkerFlags-prop
config_ldflags = config_ldflags.map(function(element){ return element.replace("-Wl,","") })
config_ldflags = config_ldflags.map(function(element){ return element.replace("-Xlinker,","") })
}

// libs
Expand Down

0 comments on commit 76deadb

Please sign in to comment.