qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Liang Qi 2018-11-16 14:03:01 +01:00
parent a7948a7519 0d3eccd2a9
commit e56df5d505
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/doc/src/qmllanguageref/qmlreference.qdoc
View File

@ -59,6 +59,7 @@ modules.
\li \l{qtqml-syntax-objectattributes.html#signal-attributes}{Signal Attributes} \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#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#attached-properties-and-attached-signal-handlers}{Attached Properties and Attached Signal Handlers}
\li \l{qtqml-syntax-objectattributes.html#enumeration-attributes}{Enumeration Attributes}
\endlist \endlist
\li \l{qtqml-syntax-propertybinding.html}{Property Binding} \li \l{qtqml-syntax-propertybinding.html}{Property Binding}

1
src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
View File

@ -673,4 +673,5 @@ property is only invoked when the property is reassigned to a different object v
\endqml \endqml
\sa {QML Basic Types} \sa {QML Basic Types}
\sa {qtqml-syntax-objectattributes.html#enumeration-attributes}{Enumeration Attributes}
*/ */