From 14504441cf06c556d95552f99e4160f94b9d3f2f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 13 May 2019 13:37:31 +0200 Subject: [PATCH] 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 --- .../{ => creator-only}/qtquick-iso-icon-browser.qdoc | 7 +------ doc/src/qtquick/qtquick-pathview-editor.qdoc | 4 +++- doc/src/qtquick/qtquick-ui-forms.qdoc | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) rename doc/src/qtquick/{ => creator-only}/qtquick-iso-icon-browser.qdoc (94%) diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc similarity index 94% rename from doc/src/qtquick/qtquick-iso-icon-browser.qdoc rename to doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc index efc216a7f6c..c84529b2982 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 bd4f4bd8519..745ebc1b553 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 16ce57a7e72..6ec6313ccf3 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