diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc index 6c385180192..0fa7ca60dff 100644 --- a/doc/qtcreator/src/external-resources/external-resources.qdoc +++ b/doc/qtcreator/src/external-resources/external-resources.qdoc @@ -1,6 +1,10 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +/*! + \externalpage https://www.perforce.com/manuals/cmdref/Content/CmdRef/P4CONFIG.html + \title Perforce: P4CONFIG +*/ /*! \externalpage https://doc.qt.io/Boot2Qt/index.html \title Boot2Qt: Documentation diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc index 3af3c6769b4..6c9c93ff51d 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc @@ -37,8 +37,8 @@ \section1 Using Configuration Files - To specify the details individually for several projects, use configuration - files: + To specify workspace details individually for several projects, use + configuration files: \list 1 \li Create a \c {p4config.txt} configuration file for each project in the @@ -46,19 +46,16 @@ \li Go to \preferences > \uicontrol {Version Control} > \uicontrol Perforce. \li Clear \uicontrol {Environment Variables}. - \li Run the following command from the command line once: - \list - \li On Windows: - \badcode - p4 set P4CONFIG=p4config.txt - \endcode - \li On Linux - \badcode - export P4CONFIG= - \endcode - \endlist + \li To set \c P4CONFIG to use the file that you created, run the + following command from the command line once: + \badcode + p4 set P4CONFIG=p4config.txt + \endcode \endlist + For more information about using the \c P4CONFIG variable, see + \l{Perforce: P4CONFIG}. + \section1 Editing Files In addition to the standard version control system functions described in