diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:21:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:21:33 +0100 |
| commit | 357dc28318b20e18a48a694dd66d62fa3a5544f1 (patch) | |
| tree | 6fdd1cabf3e2ba6bbbd86b3ef34d899624842641 | |
| parent | 0d2066ff8459f00af8f8195780d064023b8d1c38 (diff) | |
| parent | eabdd3ffefed6334f551e08f0adc2eb9cc5ede84 (diff) | |
| download | qtquickcontrols-357dc28318b20e18a48a694dd66d62fa3a5544f1.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ic1a33d305dc57a42f020389277d95aad1a6da407
| -rw-r--r-- | src/controls/SplitView.qml | 2 | ||||
| -rw-r--r-- | src/controls/TabView.qml | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index c2e361ac..868108aa 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -82,7 +82,7 @@ import QtQuick.Window 2.1 \li \l{Layout::fillHeight}{Layout.fillHeight} (\c true for only one child) \endlist - \note Please import QtQuick.Layout 1.0 in your QML file in order to use the Layout + \note import QtQuick.Layouts 1.0 in your QML file in order to use the Layout attached properties inside SplitView. Example: diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml index f7a8324a..c671a273 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.qml @@ -116,16 +116,23 @@ FocusScope { /*! \internal */ default property alias data: stack.data - /*! \qmlmethod Tab TabView::addTab(string title, Component component) - Adds a new tab page with title with and optional Component. + /*! + \qmlmethod Tab TabView::addTab(string title, Component component) + + Adds a new tab with the given \a title and an optional \a component. + Returns the newly added tab. */ function addTab(title, component) { return insertTab(__tabs.count, title, component) } - /*! \qmlmethod Tab TabView::insertTab(int index, string title, Component component) - Inserts a new tab with title at index, with an optional Component. + /*! + \qmlmethod Tab TabView::insertTab(int index, string title, Component component) + + Inserts a new tab at \a index, with the given \a title and + an optional \a component. + Returns the newly added tab. */ function insertTab(index, title, component) { |