diff options
Diffstat (limited to 'src/plugins/generator/iarew/archs/stm8')
5 files changed, 60 insertions, 60 deletions
diff --git a/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp index 8a2ab0011..b08b70bc5 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp @@ -82,10 +82,10 @@ void Stm8ArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory, const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'IarchiveOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IarchiveOverride"), - {}, {1}); + {1}); // Add 'IarchiveOutput' item (Output filename). addOptionsGroup(QByteArrayLiteral("IarchiveOutput"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp index 1e4e93706..396ee7db2 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp @@ -175,20 +175,20 @@ void Stm8AssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'AsmCaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("AsmCaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'AsmMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("AsmMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'AsmAllowMnemonics' item (Allow mnemonics in first column). addOptionsGroup(QByteArrayLiteral("AsmAllowMnemonics"), - {}, {opts.allowFirstColumnMnemonics}); + {opts.allowFirstColumnMnemonics}); // Add 'AsmAllowDirectives' item (Allow directives in first column). addOptionsGroup(QByteArrayLiteral("AsmAllowDirectives"), - {}, {opts.allowFirstColumnDirectives}); + {opts.allowFirstColumnDirectives}); // Add 'AsmMacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("AsmMacroChars"), - {0}, {opts.macroQuoteCharacter}); + {opts.macroQuoteCharacter}); } void Stm8AssemblerSettingsGroup::buildOutputPage( @@ -197,7 +197,7 @@ void Stm8AssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'AsmDebugInfo' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("AsmDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Stm8AssemblerSettingsGroup::buildPreprocessorPage( @@ -207,10 +207,10 @@ void Stm8AssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'AsmDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("AsmDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'AsmIncludePath' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("AsmIncludePath"), - {}, opts.includePaths); + opts.includePaths); } void Stm8AssemblerSettingsGroup::buildDiagnosticsPage( @@ -220,7 +220,7 @@ void Stm8AssemblerSettingsGroup::buildDiagnosticsPage( // Add 'AsmDiagnosticsWarningsAreErrors' item. // (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("AsmDiagnosticsWarningsAreErrors"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp index 23cb059a4..912d94bd0 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp @@ -327,7 +327,7 @@ void Stm8CompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'IccGenerateDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("IccGenerateDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Stm8CompilerSettingsGroup::buildLanguageOnePage( @@ -337,29 +337,29 @@ void Stm8CompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'IccCppDialect' item (C++ dialect: embedded/extended). addOptionsGroup(QByteArrayLiteral("IccCppDialect"), - {}, {opts.cxxLanguageDialect}); + {opts.cxxLanguageDialect}); // Add 'IccLanguageConformance' item // (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("IccLanguageConformance"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.useCppInlineSemantics}); + {opts.useCppInlineSemantics}); // Add 'IccRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("IccRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); } void Stm8CompilerSettingsGroup::buildLanguageTwoPage( @@ -368,14 +368,14 @@ void Stm8CompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'IccCharIs' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("IccCharIs"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item (Floatic-point // semantics: strict/relaxed conformance). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); // Add 'IccMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("IccMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); } void Stm8CompilerSettingsGroup::buildOptimizationsPage( @@ -385,15 +385,15 @@ void Stm8CompilerSettingsGroup::buildOptimizationsPage( // Add 'IccOptStrategy', 'IccOptLevel' and // 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("IccOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("IccOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("IccOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'IccOptNoSizeConstraints' iten (no size constraints). addOptionsGroup(QByteArrayLiteral("IccOptNoSizeConstraints"), - {}, {opts.disableSizeConstraints}); + {opts.disableSizeConstraints}); // Add 'IccOptAllowList' item // (Enabled optimizations: 6 check boxes). @@ -405,12 +405,12 @@ void Stm8CompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableTypeBasedAliasAnalysis) .arg(opts.enableCrossCall); addOptionsGroup(QByteArrayLiteral("IccOptAllowList"), - {}, {bitflags}); + {bitflags}); // Add 'IccNoVregs' item // (Number of virtual registers (12/16). addOptionsGroup(QByteArrayLiteral("IccNoVregs"), - {}, {opts.vregsNumber}); + {opts.vregsNumber}); } void Stm8CompilerSettingsGroup::buildPreprocessorPage( @@ -420,11 +420,11 @@ void Stm8CompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defines symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'CCIncludePath2' item // (Additional include directories). addOptionsGroup(QByteArrayLiteral("CCIncludePath2"), - {}, opts.includePaths); + opts.includePaths); } void Stm8CompilerSettingsGroup::buildDiagnosticsPage( @@ -433,7 +433,7 @@ void Stm8CompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp index d94c504c0..9477bc36e 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp @@ -294,11 +294,11 @@ void Stm8GeneralSettingsGroup::buildTargetPage( // Add 'GenCodeModel' item // (Code model: small/medium/large). addOptionsGroup(QByteArrayLiteral("GenCodeModel"), - {}, {opts.codeModel}); + {opts.codeModel}); // Add 'GenDataModel' item // (Data model: small/medium/large). addOptionsGroup(QByteArrayLiteral("GenDataModel"), - {}, {opts.dataModel}); + {opts.dataModel}); } void Stm8GeneralSettingsGroup::buildOutputPage( @@ -308,16 +308,16 @@ void Stm8GeneralSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'GOutputBinary' item (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } void Stm8GeneralSettingsGroup::buildLibraryConfigPage( @@ -328,12 +328,12 @@ void Stm8GeneralSettingsGroup::buildLibraryConfigPage( // Add 'GenRuntimeLibSelect' and 'GenRuntimeLibSelectSlave' items // (Link with runtime: none/normal/full/custom). addOptionsGroup(QByteArrayLiteral("GenRuntimeLibSelect"), - {}, {opts.libraryType}); + {opts.libraryType}); addOptionsGroup(QByteArrayLiteral("GenRuntimeLibSelectSlave"), - {}, {opts.libraryType}); + {opts.libraryType}); // Add 'GenRTConfigPath' item (Runtime configuration file). addOptionsGroup(QByteArrayLiteral("GenRTConfigPath"), - {}, {opts.configPath}); + {opts.configPath}); } void Stm8GeneralSettingsGroup::buildLibraryOptionsPage( @@ -342,10 +342,10 @@ void Stm8GeneralSettingsGroup::buildLibraryOptionsPage( const LibraryOptionsPageOptions opts(qbsProduct); // Add 'GenLibOutFormatter' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("GenLibOutFormatter"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'GenLibInFormatter' item (Scanf formatter). addOptionsGroup(QByteArrayLiteral("GenLibInFormatter"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void Stm8GeneralSettingsGroup::buildStackHeapPage( @@ -354,10 +354,10 @@ void Stm8GeneralSettingsGroup::buildStackHeapPage( const StackHeapPageOptions opts(qbsProduct); // Add 'GenStackSize' item (Stack size). addOptionsGroup(QByteArrayLiteral("GenStackSize"), - {}, {opts.stackSize}); + {opts.stackSize}); // Add 'GenHeapSize' item (Heap size). addOptionsGroup(QByteArrayLiteral("GenHeapSize"), - {}, {opts.heapSize}); + {opts.heapSize}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp index dc74587d4..731c8d91e 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp @@ -288,10 +288,10 @@ void Stm8LinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'IlinkIcfOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IlinkIcfOverride"), - {}, {1}); + {1}); // Add 'IlinkIcfFile' item (Linke configuration file). addOptionsGroup(QByteArrayLiteral("IlinkIcfFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -305,7 +305,7 @@ void Stm8LinkerSettingsGroup::buildConfigPage( // Add 'IlinkConfigDefines' item (Configuration file // symbol definitions). addOptionsGroup(QByteArrayLiteral("IlinkConfigDefines"), - {}, opts.configDefinitions); + opts.configDefinitions); } void Stm8LinkerSettingsGroup::buildLibraryPage( @@ -318,23 +318,23 @@ void Stm8LinkerSettingsGroup::buildLibraryPage( // Add 'IlinkOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("IlinkOverrideProgramEntryLabel"), - {}, {1}); + {1}); if (opts.entryPoint.isEmpty()) { // Add 'IlinkProgramEntryLabelSelect' item // (Defined by application). addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabelSelect"), - {}, {1}); + {1}); } else { // Add 'IlinkProgramEntryLabel' item // (Entry symbol). addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); } // Add 'IlinkAdditionalLibs' item (Additional libraries). addOptionsGroup(QByteArrayLiteral("IlinkAdditionalLibs"), - {}, {opts.staticLibraries}); + {opts.staticLibraries}); } void Stm8LinkerSettingsGroup::buildOptimizationsPage( @@ -345,7 +345,7 @@ void Stm8LinkerSettingsGroup::buildOptimizationsPage( // Add 'IlinkOptMergeDuplSections' item // (Merge duplicate sections). addOptionsGroup(QByteArrayLiteral("IlinkOptMergeDuplSections"), - {}, {opts.mergeDuplicateSections}); + {opts.mergeDuplicateSections}); } void Stm8LinkerSettingsGroup::buildOutputPage( @@ -355,11 +355,11 @@ void Stm8LinkerSettingsGroup::buildOutputPage( // Add 'IlinkOutputFile' item (Output file name). addOptionsGroup(QByteArrayLiteral("IlinkOutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); // Add 'IlinkDebugInfoEnable' item // (Include debug information in output). addOptionsGroup(QByteArrayLiteral("IlinkDebugInfoEnable"), - {}, {opts.enableDebugInfo}); + {opts.enableDebugInfo}); } void Stm8LinkerSettingsGroup::buildListPage( @@ -368,7 +368,7 @@ void Stm8LinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'IlinkMapFile' item (Generate linker map file). addOptionsGroup(QByteArrayLiteral("IlinkMapFile"), - {}, {opts.generateMap}); + {opts.generateMap}); } void Stm8LinkerSettingsGroup::buildDefinePage( @@ -377,7 +377,7 @@ void Stm8LinkerSettingsGroup::buildDefinePage( const DefinePageOptions opts(qbsProduct); // Add 'IlinkDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("IlinkDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); } void Stm8LinkerSettingsGroup::buildDiagnosticsPage( @@ -386,7 +386,7 @@ void Stm8LinkerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'IlinkWarningsAreErrors' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("IlinkWarningsAreErrors"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } void Stm8LinkerSettingsGroup::buildExtraOptionsPage( @@ -399,10 +399,10 @@ void Stm8LinkerSettingsGroup::buildExtraOptionsPage( // Add 'IlinkUseExtraOptions' (Use command line options). addOptionsGroup(QByteArrayLiteral("IlinkUseExtraOptions"), - {}, {1}); + {1}); // Add 'IlinkExtraOptions' item (Command line options). addOptionsGroup(QByteArrayLiteral("IlinkExtraOptions"), - {}, m_extraOptions); + m_extraOptions); } } // namespace v3 |