diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2019-05-13 13:37:31 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2019-05-15 11:56:05 +0000 |
| commit | 14504441cf06c556d95552f99e4160f94b9d3f2f (patch) | |
| tree | cf0d29e14fb1e62d0494c210944871065258d918 | |
| parent | 26354f4a275e059a10754515e6ccacb41cc9dfe5 (diff) | |
| download | qt-creator-14504441cf06c556d95552f99e4160f94b9d3f2f.tar.gz | |
Doc: Make "Browsing ISO 7000 Icons" topic creator-only
While this works in Qt Design Studio, it is easier to use a dedicated
Qt Quick Studio component called Iso for this purpose.
Change-Id: I6f2d430ae050b7e0a204077f92ae54987c47f6b7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc (renamed from doc/src/qtquick/qtquick-iso-icon-browser.qdoc) | 7 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-pathview-editor.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-ui-forms.qdoc | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc index efc216a7f6..c84529b298 100644 --- a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -26,13 +26,8 @@ /*! \contentspage index.html \page qtquick-iso-icon-browser.html - \if defined(qtdesignstudio) \previouspage qmldesigner-pathview-editor.html \nextpage creator-quick-ui-forms.html - \else - \previouspage quick-states.html - \nextpage quick-export-to-qml.html - \endif \title Browsing ISO 7000 Icons diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc index bd4f4bd851..745ebc1b55 100644 --- a/doc/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc @@ -28,10 +28,12 @@ \page qmldesigner-pathview-editor.html \if defined(qtdesignstudio) \previouspage studio-fonts.html + \nextpage creator-quick-ui-forms.html \else \previouspage quick-states.html - \endif \nextpage qtquick-iso-icon-browser.html + \endif + \title Editing PathView Properties diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc index 16ce57a7e7..6ec6313ccf 100644 --- a/doc/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/src/qtquick/qtquick-ui-forms.qdoc @@ -33,10 +33,11 @@ \contentspage index.html \page creator-quick-ui-forms.html - \previouspage qtquick-iso-icon-browser.html \if defined(qtdesignstudio) + \previouspage qmldesigner-pathview-editor.html \nextpage studio-live-preview.html \else + \previouspage qtquick-iso-icon-browser.html \nextpage quick-export-to-qml.html \endif |