diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
| commit | d588ec795bf905d6d4a4827ad74f3d01315e40bf (patch) | |
| tree | 67227f80379d77962602b758093251b593ee0c08 /src/quick/items/qquickrectangle.cpp | |
| parent | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (diff) | |
| parent | fdc18a5f25ba1c4cf35e1fa6f21272167bde36a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
Diffstat (limited to 'src/quick/items/qquickrectangle.cpp')
| -rw-r--r-- | src/quick/items/qquickrectangle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index d6323026e7..ee1b66f2b5 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -331,6 +331,7 @@ void QQuickRectangle::doUpdate() */ /*! + \qmlpropertygroup QtQuick::Rectangle::border \qmlproperty int QtQuick::Rectangle::border.width \qmlproperty color QtQuick::Rectangle::border.color |