diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-07-27 11:42:14 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-07-27 12:36:49 +0300 |
| commit | 6b32f8194bb4cfc7ec54c30bdd7102ce30380e44 (patch) | |
| tree | dd24b83661e3f2d08ce39ab3ab35174e790d490c /doc | |
| parent | ae1368529849bcad0d7d524ae9396c4205209322 (diff) | |
| parent | ec85d5e1706dd3bead3cfaf5e09127a4798d90e2 (diff) | |
| download | qbs-6b32f8194bb4cfc7ec54c30bdd7102ce30380e44.tar.gz | |
Merge branch '1.19' into 1.20
Change-Id: I2c7c200d4b0057bf7115306d000c13e60d2e8bd2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/codesign-module.qdoc | 16 | ||||
| -rw-r--r-- | doc/reference/modules/qbs-module.qdoc | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/doc/reference/modules/codesign-module.qdoc b/doc/reference/modules/codesign-module.qdoc index d0aba4688..45e247a6a 100644 --- a/doc/reference/modules/codesign-module.qdoc +++ b/doc/reference/modules/codesign-module.qdoc @@ -343,6 +343,22 @@ */ /*! + \qmlproperty string codesign::timestampAlgorithm + + Specifies the default timestamp algorithm used together with the + \c signingTimestamp property. The possible values are \c sha1, \c sha256. + + \note If this value is not set, then the default sha1 algorithm + will be used. + + \since Qbs 1.19.2 + + \defaultvalue \c undefined + + \windowsproperty +*/ + +/*! \qmlproperty string codesign::certificatePath Specifies the full path to the signing certificate file (*.pfx). diff --git a/doc/reference/modules/qbs-module.qdoc b/doc/reference/modules/qbs-module.qdoc index c02de65ab..82a9120cc 100644 --- a/doc/reference/modules/qbs-module.qdoc +++ b/doc/reference/modules/qbs-module.qdoc @@ -526,6 +526,9 @@ \li \c{"msvc"} \li \c{["msvc"]} \row + \li \c{"qcc"} + \li \c{["qcc"]} + \row \li \c{"sdcc"} \li \c{["sdcc"]} \row |