diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-22 17:17:57 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-22 17:17:57 +0200 |
| commit | f1aff1f2d495562460a87d351e62c06109045a3a (patch) | |
| tree | 93e4659421a3dc1fc664b539bf7e48ce28f64e84 /src/qml/qml/v8/qqmlbuiltinfunctions.cpp | |
| parent | 842ada7b04d68cd37df2556bf50b48d8a5f39ec4 (diff) | |
| parent | 46ed14da325c6c0382c0bc54cacc347d2d7f2b0a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Change-Id: Iff06429f948ac6cdec77a9e5bb8c5375c56fe705
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 56188a4b7d..96c898e6d4 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -857,6 +857,8 @@ In addition the following expressions can be used to specify the time: \li use AM/PM display. \e AP will be replaced by either "AM" or "PM". \row \li ap \li use am/pm display. \e ap will be replaced by either "am" or "pm". + \row \li t + \li include a time-zone indicator. \endtable All other input characters will be ignored. Any sequence of characters that |