diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
| commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
| tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | |
| parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
| parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index 3692605c18..db9eee7714 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -724,7 +724,8 @@ Rectangle { signal activated(real xPosition, real yPosition) signal deactivated - width: 100; height: 100 + property int side: 100 + width: side; height: side MouseArea { anchors.fill: parent |