diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-17 14:43:05 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-17 14:43:05 (GMT) |
| commit | caee66da925949cf7aef2ff8e1a86c38dd6e6efd (patch) | |
| tree | d76f2f88fd269d1a884e0f507c10b4ee1d7b279a /examples | |
| parent | c78eb49081359e2f855d65ebc5511cb7572fa732 (diff) | |
| parent | 195fbdfb7f9a8ade3347a651090722a7d3ecccfb (diff) | |
| download | Qt-caee66da925949cf7aef2ff8e1a86c38dd6e6efd.zip Qt-caee66da925949cf7aef2ff8e1a86c38dd6e6efd.tar.gz Qt-caee66da925949cf7aef2ff8e1a86c38dd6e6efd.tar.bz2 | |
Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7
Conflicts:
doc/src/declarative/propertybinding.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeview.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/ui-components/tabwidget/TabWidget.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/declarative/ui-components/tabwidget/TabWidget.qml index ac2dea3..fe838b5 100644 --- a/examples/declarative/ui-components/tabwidget/TabWidget.qml +++ b/examples/declarative/ui-components/tabwidget/TabWidget.qml @@ -45,7 +45,7 @@ Item { // Setting the default property to stack.children means any child items // of the TabWidget are actually added to the 'stack' item's children. - // See the "Writing QML Components: Properties, Methods and Signals" + // See the "Property Binding" // documentation for details on default properties. default property alias content: stack.children |