diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-30 09:43:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-30 09:43:14 +0100 |
| commit | 502447e15b38d6111c23d608240e0d7afb7c2ad6 (patch) | |
| tree | e0c578cc2478518f0738dee396445d35cbd25786 /src/qml/doc | |
| parent | 708e4f7e626468f53636b7d2ef7c6a99c129751f (diff) | |
| parent | 4a886753a75c7c4d66f1fa9cab5a6c5a03240df3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12.0
Conflicts:
src/imports/settings/qqmlsettings.cpp
src/quick/items/qquickwindow.cpp
tools/qmlplugindump/main.cpp
Change-Id: I3e5dae4de25b2da961a572b3a4bd151181d211c9
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index 31650db7c0..2bb1fcac61 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -462,6 +462,8 @@ Unlike an ordinary property, an alias has the following restrictions: \li The \e {alias reference} is not optional, unlike the optional default value for an ordinary property; the alias reference must be provided when the alias is first declared. +\li It cannot refer to \l {Attached Properties and Attached Signal Handlers} + {attached properties}. \li It cannot refer to grouped properties; the following code will not work: \code property alias color: rectangle.border.color |