diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc index ebae6a113af..74128bed458 100644 --- a/doc/qtcreator/src/howto/creator-external-tools.qdoc +++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc @@ -163,8 +163,10 @@ To globally change the system environment from the one in which \QC is started, select \uicontrol Tools > \uicontrol Options > \uicontrol Environment > \uicontrol System, and then select - \uicontrol Change in the \uicontrol Environment field. For more - information, see \l{Specifying Environment Settings}. + \uicontrol Change in the \uicontrol Environment field. + \if defined(qtcreator) + For more information, see \l{Specifying Environment Settings}. + \endif \li Select the \uicontrol {Modifies current document} check box to make sure that if the current document is modified by the tool, it is saved diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index 1fa57efd9f8..90287f9a7ca 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -230,17 +230,18 @@ \li Uses a \uicontrol Grid component to lay out the selected components. \li \l{Using Layouts} + \if defined(qtdesignstudio) \row \li \inlineimage icons/edit.png \li \uicontrol {Show Event List} (\key {Alt+E}): opens a dialog for - viewing and creating an {event list} for an - application flow. + viewing and creating an event list for an application flow. \li \l{Simulating Events} \row \li \inlineimage icons/assign.png \li \uicontrol {Assign Events to Actions} (\key {Alt+A}): assigns events to actions in an application flow. \li \l{Simulating Events} + \endif \row \li Styling \li Displays the UI style used for UI controls. diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc index f04a7460e83..9dc2867e28b 100644 --- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc @@ -89,9 +89,10 @@ \image qmldesigner-states.png "States and Properties views" - \note If you have \l{Locking Items}{locked an item} in \uicontrol Navigator, - and you attempt to remove states where you change the values of its - properties, you are prompted to confirm the removal. + \note If you have \l{Locking Components}{locked a component} in + \uicontrol Navigator, and you attempt to remove states where you + change the values of its properties, you are prompted to confirm + the removal. For more information, watch the following video: