diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /src/qml/doc/src/documents/topic.qdoc | |
parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'src/qml/doc/src/documents/topic.qdoc')
-rw-r--r-- | src/qml/doc/src/documents/topic.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/doc/src/documents/topic.qdoc b/src/qml/doc/src/documents/topic.qdoc index 1013aef9c6..f8a402476c 100644 --- a/src/qml/doc/src/documents/topic.qdoc +++ b/src/qml/doc/src/documents/topic.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -91,14 +91,14 @@ separation between UI definition and logic implementation. In the following example, the client developer defines a \c Button type with a document in a file: -\snippet qml/qml-extending-types/components/Button.qml 0 +\snippet ../src/quick/doc/snippets/qml/qml-extending-types/components/Button.qml 0 The \c Button type can then be used in an application: \table \row -\li \snippet qml/qml-extending-types/components/application.qml 0 -\li \image qml-extending-types.png +\li \snippet ../src/quick/doc/snippets/qml/qml-extending-types/components/application.qml 0 +\li \image button-types.png \endtable Please see the documentation about \l{qtqml-documents-definetypes.html} |