diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-09-24 12:02:51 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-01 14:14:07 +0000 |
| commit | eed1db08c739fd22eb00e55206eb7b28310d79d0 (patch) | |
| tree | ceb9ce42ca0b5aac933fa85f441cb15d11febd9f /src | |
| parent | 37ef97bfa812a9a6f90b0513d31bd83bf7ce2a87 (diff) | |
Refactor the map file generation property
1. It is makes sense to define this property once inside of
CppModule, instead of duplicate it in each other module.
2. A new property name 'generateLinkerMapFile' will be better
than a previous, so, we can rename this property.
3. The map file generation is not necessary to be always
enabled, so, we can disable this property by default.
Change-Id: I0439e8b3e0273593c8456d32b1c099ff09498fad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp index b6b755b70..7e29c2788 100644 --- a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp @@ -225,7 +225,7 @@ struct ListPageOptions final { const auto &qbsProps = qbsProduct.moduleProperties(); generateMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")) + qbsProps, QStringLiteral("generateLinkerMapFile")) ? ListPageOptions::GenerateListing : ListPageOptions::NoListing; } diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp index 9fdb57a5a..59ba515d9 100644 --- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp @@ -183,7 +183,7 @@ struct ListPageOptions final { const auto &qbsProps = qbsProduct.moduleProperties(); generateMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")) + qbsProps, QStringLiteral("generateLinkerMapFile")) ? ListPageOptions::GenerateListing : ListPageOptions::NoListing; } diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp index 32b734d4a..a88ac22e1 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp @@ -148,7 +148,7 @@ struct ListPageOptions final { const auto &qbsProps = qbsProduct.moduleProperties(); generateMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")) + qbsProps, QStringLiteral("generateLinkerMapFile")) ? ListPageOptions::GenerateListing : ListPageOptions::NoListing; } diff --git a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp index c7459dc49..b85edbb83 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp @@ -135,7 +135,7 @@ struct ListPageOptions final { const auto &qbsProps = qbsProduct.moduleProperties(); generateMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")) + qbsProps, QStringLiteral("generateLinkerMapFile")) ? ListPageOptions::GenerateListing : ListPageOptions::NoListing; } diff --git a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp index 731c8d91e..2d3780e4f 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp @@ -208,7 +208,7 @@ struct ListPageOptions final { const auto &qbsProps = qbsProduct.moduleProperties(); generateMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")) + qbsProps, QStringLiteral("generateLinkerMapFile")) ? ListPageOptions::GenerateListing : ListPageOptions::NoListing; } diff --git a/src/plugins/generator/keiluv/archs/arm/armtargetmiscgroup_v5.cpp b/src/plugins/generator/keiluv/archs/arm/armtargetmiscgroup_v5.cpp index 511a16ab8..18da47c84 100644 --- a/src/plugins/generator/keiluv/archs/arm/armtargetmiscgroup_v5.cpp +++ b/src/plugins/generator/keiluv/archs/arm/armtargetmiscgroup_v5.cpp @@ -50,7 +50,7 @@ struct MiscPageOptions final const auto flags = qbs::KeiluvUtils::cppModuleCompilerFlags(qbsProps); generateLinkerMap = gen::utils::cppBooleanModuleProperty( - qbsProps, QStringLiteral("generateMapFile")); + qbsProps, QStringLiteral("generateLinkerMapFile")); } int generateLinkerMap = 0; |