diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-16 14:03:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-16 14:03:01 +0100 |
| commit | e56df5d505b92de46840d24e84650f92c7c24431 (patch) | |
| tree | ac31685a5b3f8858139b5834b9444fbbfcd3d115 | |
| parent | a7948a7519c3b0d4660637e8697311bd8abdc85d (diff) | |
| parent | 0d3eccd2a982faa46e8515cd5c55f95adcc5f868 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
src/qml/compiler/qv4codegen.cpp
tests/auto/qml/v4misc/tst_v4misc.cpp
Change-Id: I3a7662d14a2eb3d8c37ac522ef4400b6b6ec30d9
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/qmlreference.qdoc | 1 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc index 3c3999f324..901a4a57fe 100644 --- a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc +++ b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc @@ -59,6 +59,7 @@ modules. \li \l{qtqml-syntax-objectattributes.html#signal-attributes}{Signal Attributes} \li \l{qtqml-syntax-objectattributes.html#method-attributes}{Method Attributes} \li \l{qtqml-syntax-objectattributes.html#attached-properties-and-attached-signal-handlers}{Attached Properties and Attached Signal Handlers} + \li \l{qtqml-syntax-objectattributes.html#enumeration-attributes}{Enumeration Attributes} \endlist \li \l{qtqml-syntax-propertybinding.html}{Property Binding} diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc index b25ed625b2..c4c1b61693 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc @@ -673,4 +673,5 @@ property is only invoked when the property is reassigned to a different object v \endqml \sa {QML Basic Types} + \sa {qtqml-syntax-objectattributes.html#enumeration-attributes}{Enumeration Attributes} */ |