diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:43 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:43 +0300 |
| commit | b4fd36dedcc112e3ab5818dbc173d5ebf9ae7976 (patch) | |
| tree | ce75b948745d43386f75a5f5a79deaf691af2d41 /src/controls/ApplicationWindow.qml | |
| parent | cc7c4ba902ae6ab3b5eba80d7075ad8d6183a7ec (diff) | |
| parent | 644728a2120880c2f8c9b32ce496efd6158a1107 (diff) | |
| download | qtquickcontrols-b4fd36dedcc112e3ab5818dbc173d5ebf9ae7976.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ide92e6a626be1a56b99c997b1bb4a28451eddedf
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index c8e374ad..ff8b0728 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -118,7 +118,7 @@ Window { // The below documentation was supposed to be written as a grouped property, but qdoc would // not render it correctly due to a bug (https://bugreports.qt-project.org/browse/QTBUG-34206) /*! - \qmlproperty ApplicationWindow::contentItem + \qmlproperty ContentItem ApplicationWindow::contentItem This group holds the size constraints of the content item. This is the area between the \l ToolBar and the \l StatusBar. |