feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Editing info on Perforce

Browse Source 
Converting a table to text to be able to describe the related
options next to the functions.

Change-Id: If50084e4e83a3c8a50cad84c458f58caa979ac86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Leena Miettinen
2016-11-24 15:11:50 +01:00
parent be2697f818
commit 319a3e231a
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
doc/src/vcs/creator-vcs-perforce.qdoc
View File

@@ -40,6 +40,8 @@
Perforce is a fast software configuration management system developed by Perforce is a fast software configuration management system developed by
Perforce Software. Perforce Software.
\section1 Configuring Perforce
When you start \QC, it looks for the executable specified When you start \QC, it looks for the executable specified
in the \uicontrol{P4 command} field in \uicontrol{Tools > Options > Version in the \uicontrol{P4 command} field in \uicontrol{Tools > Options > Version
Control > Perforce}. If the file is not found, the following error Control > Perforce}. If the file is not found, the following error
@@ -54,31 +56,34 @@
deselect the \uicontrol Load check box for the \uicontrol Perforce plugin in deselect the \uicontrol Load check box for the \uicontrol Perforce plugin in
the \uicontrol {Version Control} group. the \uicontrol {Version Control} group.
\section1 Using Additional Perforce Functions
In the Perforce options, you can specify workspace details: In the Perforce options, you can specify workspace details:
\uicontrol {P4 user}, \uicontrol {P4 client}, and \uicontrol {P4 port}. To \uicontrol {P4 user}, \uicontrol {P4 client}, and \uicontrol {P4 port}. To
specify the details individually for several projects, use configuration specify the details individually for several projects, use configuration
files instead. Create a \c {p4config.txt} configuration file for each files instead. Create a \c {p4config.txt} configuration file for each
project in the top level project directory. project in the top level project directory.
The \uicontrol Perforce submenu contains the following additional items: \section1 Editing Files
\table In addition to the standard version control system functions described in
\header \l {Using Common Functions}, you can select \uicontrol Tools >
\li Menu Item \uicontrol Perforce > \uicontrol {Edit File} to open a file for editing
\li Description within the client workspace. By default, files are automatically opened for
\row editing. To disable this feature, select \uicontrol Tools >
\li \uicontrol{Describe} \uicontrol Options > \uicontrol {Version Control} > \uicontrol Perforce,
\li View information about changelists and the files in them. and then deselect the \uicontrol {Automatically open files when editing}
\row check box.
\li \uicontrol{Edit File}
\li Open a file for editing. To list files that are open for editing, select \uicontrol Tools >
\row \uicontrol Perforce > \uicontrol Opened.
\li \uicontrol{Opened}
\li List files that are open for editing. To group files for commit, select \uicontrol Tools > \uicontrol Perforce >
\row \uicontrol {Pending Changes}.
\li \uicontrol{Pending Changes}
\li Group files for commit. To view information about changelists and the files in them, select
\endtable \uicontrol Tools > \uicontrol Perforce > \uicontrol Describe.
By default, you are prompted to confirm that you want to submit changes.
To suppress the prompt, select \uicontrol Tools > \uicontrol Options >
\uicontrol {Version Control} > \uicontrol Perforce, and then deselect the
\uicontrol {Prompt on submit} check box.
*/ */