From eed1db08c739fd22eb00e55206eb7b28310d79d0 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 24 Sep 2019 12:02:51 +0300 Subject: 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 --- share/qbs/modules/cpp/sdcc.qbs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'share/qbs/modules/cpp/sdcc.qbs') diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs index 119a0ba92..6bcbc2580 100644 --- a/share/qbs/modules/cpp/sdcc.qbs +++ b/share/qbs/modules/cpp/sdcc.qbs @@ -68,12 +68,6 @@ CppModule { property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" - property bool generateMapFile: true - PropertyOptions { - name: "generateMapFile" - description: "produce a linker list file (enabled by default)" - } - /* Work-around for QtCreator which expects these properties to exist. */ property string cCompilerName: compilerName property string cxxCompilerName: compilerName @@ -151,7 +145,7 @@ CppModule { outputFileTags: { var tags = ["application"]; - if (product.moduleProperty("cpp", "generateMapFile")) + if (product.moduleProperty("cpp", "generateLinkerMapFile")) tags.push("map_file"); return tags; } @@ -163,7 +157,7 @@ CppModule { PathTools.applicationFilePath(product)) }; var artifacts = [app]; - if (product.cpp.generateMapFile) { + if (product.cpp.generateLinkerMapFile) { artifacts.push({ fileTags: ["map_file"], filePath: FileInfo.joinPaths( -- cgit v1.2.3