1 files changed, 5 insertions, 9 deletions
diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs
index eba52adff..ea99b589c 100644
--- a/share/qbs/modules/cpp/keil.qbs
+++ b/share/qbs/modules/cpp/keil.qbs
@@ -62,8 +62,7 @@ CppModule {
     compilerDefinesByLanguage: keilProbe.compilerDefinesByLanguage
     compilerIncludePaths: keilProbe.includePaths
 
-    property string toolchainInstallPath: compilerPathProbe.found
-        ? compilerPathProbe.path : undefined
+    toolchainInstallPath: compilerPathProbe.found ? compilerPathProbe.path : undefined
 
     property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : ""
 
@@ -90,9 +89,8 @@ CppModule {
 
     staticLibrarySuffix: KEIL.staticLibrarySuffix(qbs)
     executableSuffix: KEIL.executableSuffix(qbs)
-
-    property string objectSuffix: KEIL.objectSuffix(qbs)
-    property string mapFileSuffix: KEIL.mapFileSuffix(qbs)
+    objectSuffix: KEIL.objectSuffix(qbs)
+    linkerMapSuffix: KEIL.linkerMapSuffix(qbs)
 
     imageFormat: KEIL.imageFormat(qbs)
 
@@ -105,8 +103,7 @@ CppModule {
         id: assembler
         inputs: ["asm"]
         outputFileTags: ["obj", "lst"]
-        outputArtifacts: KEIL.compilerOutputArtifacts(
-            input, input.cpp.generateAssemblerListingFiles)
+        outputArtifacts: KEIL.compilerOutputArtifacts(input, false)
         prepare: KEIL.prepareAssembler.apply(KEIL, arguments)
     }
 
@@ -120,8 +117,7 @@ CppModule {
         inputs: ["cpp", "c"]
         auxiliaryInputs: ["hpp"]
         outputFileTags: ["obj", "lst"]
-        outputArtifacts: KEIL.compilerOutputArtifacts(
-            input, input.cpp.generateCompilerListingFiles)
+        outputArtifacts: KEIL.compilerOutputArtifacts(input, true)
         prepare: KEIL.prepareCompiler.apply(KEIL, arguments)
     }