aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-06-05 18:05:39 -0400
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-06-18 10:52:02 +0200
commita213f293f525759342d5e73d497858d728168bae (patch)
treeb4e46ff7ba61358eaeb238323f14d4bcbca0df6e /doc
parentf4e6d8c42e0cc14b8ac9aebb3ca984d0b9edcf57 (diff)
Make the toolchain property a list.
This allows us to differentiate between clang and gcc toolchains, and also allows us to easily apply conditions to multiple related toolchains (gcc, clang, mingw are all considered part of the gcc toolchain family). The probes now also correctly set the toolchain. Change-Id: Ic5d01fe7fe25dd5e5937cbff7d9253f180571533 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/qbs.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index ed17439e6..55184bc7b 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -920,11 +920,11 @@
\section1 toolchain
\table
- \row \li \b{Type:} \li \c{string}
- \row \li \b{Allowed Values:} \li \c{"gcc"}, \c{"clang"}, \c{"mingw"}, \c{"msvc"}
+ \row \li \b{Type:} \li \c{Array} of \c{string}
+ \row \li \b{Allowed Values:} \li \c{"gcc"}, \c{"llvm"}, \c{"clang"}, \c{"mingw"}, \c{"msvc"}
\endtable
- Specifies the toolchain that is going to be used for this build.
+ Specifies the attributes of the toolchain that is going to be used for this build.
\section1 sysroot