aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-08 15:06:18 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-07-14 18:12:54 +0200
commitecc03e2e54a94562df750e571fc1058d012e0f57 (patch)
treed397a08edf7253a8f903df6a4d80417aca491396 /doc
parent88848889797dfe08119d35c573d3ea1691127129 (diff)
introduce cpp.compilerPathByLanguage
The setup-toolchains tool stores the compiler path per language in compilerPathByLanguage for toolchains that provide different compiler binaries for different languages. For the gcc/clang toolchains we now use g++/clang++ for C++ and gcc/clang for everything else. Change-Id: I62ce5a5a4217e2832fafd03301ff75efab62a608 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/modules/cpp-module.qdoc15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index 8c2368bd8..0024d1b23 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -333,7 +333,7 @@
\row \li \b{Default:} \li determined by qbs-setup-toolchains
\endtable
- Name of the compiler binary. This is set in the build profile.
+ Name of the main compiler binary. This is set in the build profile.
\section2 compilerPath
@@ -342,7 +342,18 @@
\row \li \b{Default:} \li determined by qbs-setup-toolchains
\endtable
- Full path of the compiler binary. This is set in the build profile.
+ Full path of the main compiler binary. This is set in the build profile.
+ If the toolchain provides different compilers for different languages, then
+ \c{compilerPathByLanguage} is used.
+
+ \section2 compilerPathByLanguage
+
+ \table
+ \row \li \b{Type:} \li \c{string} to \c{string} map
+ \row \li \b{Default:} \li determined by qbs-setup-toolchains
+ \endtable
+
+ Maps file tags to full paths of compiler binaries. This is set in the build profile.
\section2 compilerWrapper