aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@theqtcompany.com>2015-10-28 18:57:11 -0700
committerJake Petroules <jake.petroules@theqtcompany.com>2015-10-31 03:23:28 +0000
commita36012d727bb0f755b349e64af481d315c06bd56 (patch)
treefe7ec3424323a4df08095da8c396c58717b51e7a /doc
parente58833f87a83156b886ad435294bd3cbbc21f496 (diff)
Introduce new assembler-related properties.
This adds: - cpp.assemblerName - cpp.assemblerPath - cpp.assemblerFlags - cpp.platformAssemblerFlags Users can now, for example, use nasm instead of GNU as (default). Task-number: QBS-891 Change-Id: I8501abea494b327ac95f02f3cded263dbe72f12f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/modules/cpp-module.qdoc18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index 6b0bf30a8..a9d39ebb6 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -230,6 +230,12 @@
\li undefined
\li The patch level component of the compiler version.
\row
+ \li assemblerFlags
+ \li \c{stringList}
+ \li 1.5
+ \li undefined
+ \li Additional flags for the assembler.
+ \row
\li cppFlags
\li \c{stringList}
\li 1.0
@@ -299,6 +305,18 @@
\li \c{undefined}
\li List of linker script files.
\row
+ \li assemblerName
+ \li \c{string}
+ \li 1.5
+ \li determined by qbs-setup-toolchains
+ \li Name of the assembler binary. This is set in the build profile.
+ \row
+ \li assemblerPath
+ \li \c{string}
+ \li 1.5
+ \li determined by qbs-setup-toolchains
+ \li Full path of the assembler binary. This is set in the build profile.
+ \row
\li compilerName
\li \c{string}
\li 1.0