diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-01 01:00:11 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-01 13:19:03 +0200 |
commit | 9d8c309e27c87ce8a5c58f7f03de535ce999ff24 (patch) | |
tree | 37db3e8626bb34b6dac078c1762ff299af90a29a /src/qml/doc/src | |
parent | f294fda40c19c0ecc3c99efb3aabe1b14933cc84 (diff) | |
parent | a30138cae86268d71415bc88cfba157977f4a442 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I654a2a4b34dadc7cb7d85625b86f54691ad5904a
Diffstat (limited to 'src/qml/doc/src')
-rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc index c4f44d7d40..a5f730e8d4 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc @@ -67,7 +67,7 @@ For example, the standard \c Date and \c Array types are available, as below: import QtQuick 2.0 Item { - property var theArray: new Array() + property var theArray: [] property var theDate: new Date() Component.onCompleted: { |