diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-14 14:31:13 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-14 14:40:22 +0100 |
commit | e91f6b50957c504bd05bba20734c56eb8d6f2f23 (patch) | |
tree | 9bd7e563e8530b8db4fb7fdc90b83edfb4f252b3 /doc | |
parent | 154b78e01ad4fdec9c68ca84b9ac0afd8d5a22e8 (diff) | |
parent | 4d97182f31e19881d8246324bc1a119b7d77e28a (diff) |
Merge remote-tracking branch 'origin/1.1'
Change-Id: I7475c4a71c15c83c59400c44ef96d73d15caea58
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index f5a05425f..564ca7e24 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -322,7 +322,7 @@ \row \li \b{Default:} \li determined by qbs-detect-toolchains \endtable - Directory where the compiler binary is located. This is set in the build profile. + Full path of the compiler binary. This is set in the build profile. \section2 compilerWrapper @@ -334,6 +334,24 @@ Wrapper binary and its arguments for wrapping compiler calls. This is useful for compiler wrappers like ccache and alike. + \section2 linkerName + + \table + \row \li \b{Type:} \li \c{string} + \row \li \b{Default:} \li determined by qbs-detect-toolchains + \endtable + + Name of the linker binary. This is set in the build profile. + + \section2 linkerPath + + \table + \row \li \b{Type:} \li \c{string} + \row \li \b{Default:} \li determined by qbs-detect-toolchains + \endtable + + Full path of the linker binary. This is set in the build profile. + \section2 supportedStaticLibrarySuffixes \table |