diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-03 11:24:26 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 08:35:08 +0000 |
| commit | 2bda52aa3d50deb56128f42395ae9f2686af2a99 (patch) | |
| tree | ec88cd206f39606aa97df9a72c05cfea5fc2f203 /doc | |
| parent | b9a1173d3b3677416295c4739aa53d35365fa0e1 (diff) | |
Make cpp.cxxLanguageVersion a list
... and choose the highest entry. This enables different modules to
specify their requirements without introducing conflicts.
Same for cpp.cLanguageVersion.
Task-number: QBS-1225
Change-Id: I96ed6c370eb190023fdb69274dcb080d967f512d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 02199ebe7..0818af28d 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -620,7 +620,7 @@ */ /*! - \qmlproperty string cpp::cLanguageVersion + \qmlproperty stringList cpp::cLanguageVersion \since Qbs 1.4 The version of the C standard with which the code must comply. @@ -629,6 +629,7 @@ added, depending on the toolchain. If the value is left undefined, the compiler default will be used. + If the list contains more than one value, the highest version is chosen. Possible values include: \c{"c89"}, \c{"c99"}, \c{"c11"}. @@ -636,7 +637,7 @@ */ /*! - \qmlproperty string cpp::cxxLanguageVersion + \qmlproperty stringList cpp::cxxLanguageVersion \since Qbs 1.4 The version of the C++ standard with which the code must comply. @@ -645,6 +646,7 @@ added, depending on the toolchain. If the value is left undefined, the compiler default will be used. + If the list contains more than one value, the highest version is chosen. Possible values include: \c{"c++98"}, \c{"c++11"}, \c{"c++14"}, \c{"c++17"}. |