summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-03-01 17:40:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 17:57:28 +0100
commit0db39ab11b0a56140182b75edd34a17a8e873ae4 (patch)
treed44de7f86cd5c691025529847a512690248451b4 /src
parent1910321dafc189e1df0ed2dd60765fac99a87a25 (diff)
Make statusBar and toolBar item references
This makes it possible to access window.toolBar as real items. Before they were really toolBarArea and statusBarArea. Change-Id: I58297d074a86d71f2a27f8ceafaf46627608010c Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/controls/ApplicationWindow.qml10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index 128c058e5..c78daa609 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -103,7 +103,7 @@ Window {
By default this value is not set. When you set the toolBar Item, it will
be anchored automatically into the AppliacationWindow.
*/
- property alias toolBar: toolBarArea.data
+ property Item toolBar
/*!
\qmlproperty Item ApplicationWindow::statusBar
@@ -115,7 +115,13 @@ Window {
By default this value is not set. When you set the toolBar Item, it will
be anchored automatically into the AppliacationWindow.
*/
- property alias statusBar: statusBarArea.data
+ property Item statusBar
+
+ /*! \internal */
+ onToolBarChanged: { if (toolBar) { toolBar.parent = toolBarArea } }
+
+ /*! \internal */
+ onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } }
/*! \internal */
default property alias data: contentArea.data