From 6181399187214eaf72327314205e516699a96e04 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 25 Aug 2020 09:44:15 +0200 Subject: Doc: Use local value for \QMLD macro in Qt Design Studio Manual This enables us to get rid of the product name "Qt Quick Designer" in Qt Design Studio context. However, the macro can no longer be used for UI text. Actually, it does not make much sense, because the UI text is not dynamic. It would be good to also replace it in the UI with something more generic, or with "Form Editor", for example. Change-Id: I5884f090f915d5ff0c64428239bfd324cd1941c2 Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc | 6 +++--- doc/qtcreator/src/qtquick/qtquick-properties.qdoc | 2 +- doc/qtdesignstudio/config/qtdesignstudio.qdocconf | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc index c37643d7bb..abb3dec108 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc @@ -162,7 +162,7 @@ To use an emulation layer that is built with the Qt configured in the build and run kit for the project, select \uicontrol Tools > - \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} > + \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} > \uicontrol {Use QML emulation layer which is built by the selected Qt} radio button. \QC builds the emulation layer when you select the Design mode. diff --git a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc index 3d963cf7dd..487ae50723 100644 --- a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc @@ -63,7 +63,7 @@ button to anchor the item to the items that you snap to. Choose \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} > - \uicontrol {\QMLD} to specify settings for snapping. In the + \uicontrol {Qt Quick Designer} to specify settings for snapping. In the \uicontrol {Parent item padding} field, specify the distance in pixels between the parent item and the snapping lines. In the \uicontrol {Sibling item spacing} field, specify the distance in pixels between @@ -99,14 +99,14 @@ \image qmldesigner-preview-size.png "Canvas width and height" To set the initial size of the root item, select \uicontrol Tools > - \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} and + \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} and specify the item width and height in the \uicontrol {Root Item Init Size} group. \section1 Specifying Canvas Size To change the canvas size, select \uicontrol Tools > \uicontrol Options > - \uicontrol {Qt Quick} > \uicontrol {\QMLD} and + \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} and specify the canvas width and height in the \uicontrol Canvas group. \section1 Refreshing the Form Editor Contents diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc index b26107ca2a..b356ac9633 100644 --- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc @@ -185,7 +185,7 @@ If you use text IDs instead of plain text, change the default call to \c qsTrId(). Select \uicontrol Tools > \uicontrol Options > - \uicontrol {Qt Quick} > \uicontrol {\QMLD}, and then select the + \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}, and then select the \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization group. For more information about text ID based translations, see \l {Qt Linguist Manual: Text ID Based Translations}. diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index b3ba045381..b8d7f0659e 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -112,6 +112,7 @@ qhp.qtdesignstudio.subprojects.manual.type = manual # Doxygen compatibility commands macro.see = "\\sa" macro.function = "\\fn" +macro.QMLD = "Qt Design Studio" navigation.landingpage = "$IDE_DISPLAY_NAME Manual" buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION" -- cgit v1.2.3