diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-07-27 14:47:46 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-07-27 14:47:46 +0000 |
commit | 34349e6574500e087ced56cc9504431b3e3b6469 (patch) | |
tree | d1e822daf5382d536d3b2c8940152526fd2a8f04 /share/qbs/modules/cpp/keil.js | |
parent | 31a841ade7b1a3b10d5a132cc58a476295e2e0b5 (diff) | |
parent | eb6adb2a65902ca507dd1fdcd97fde333f324068 (diff) |
Merge "Merge branch 1.17 into master"
Diffstat (limited to 'share/qbs/modules/cpp/keil.js')
-rw-r--r-- | share/qbs/modules/cpp/keil.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 441b49213..4cb2946a6 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -1011,8 +1011,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) { // Misc flags. args = args.concat(ModUtils.moduleProperty(input, "platformFlags", tag), - ModUtils.moduleProperty(input, "flags", tag), - ModUtils.moduleProperty(input, "driverFlags", tag)); + ModUtils.moduleProperty(input, "flags", tag)); return args; } |