diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-31 08:53:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-31 08:53:21 +0200 |
| commit | 9b563dc1424ce59072e8b05250d30dbb553a6724 (patch) | |
| tree | eaeb9aae495a6074f509c397637523cc6830dd64 /doc | |
| parent | b01813d7940fb08aa0d746f577207c44e759fa91 (diff) | |
| parent | b8eea8f9f8922f883ad9e5a54c6d35183138ccc1 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I3b2d81462b2dfb9753863c87c79ffbbf8d536aac
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/editors/creator-editors.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 658a4d686e..603752dba8 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -3112,11 +3112,11 @@ \li log(x) \li Returns the natural logarithm (base E) of x \row - \li max(x, y) - \li Returns the higher value of x and y + \li max([value1[, value2[, ...]]]) + \li Returns the highest value of the given numbers \row - \li min(x, y) - \li Returns the lower value of x and y + \li min([value1[, value2[, ...]]]) + \li Returns the lowest value of the given numbers \row \li oct(x) \li Returns the octal representation of x |