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

Doc: Introduce a macro \macos to adapt to upcoming renamings

Browse Source 
Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.

Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
hjk
2016-08-03 16:46:29 +02:00
committed by hjk
parent 36f9c5f7d0
commit 1e8ffa20d0
28 changed files with 83 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/howto/creator-cli.qdoc
View File

@@ -61,7 +61,7 @@
\endlist
On OS X:
On \macos:
\list

4
doc/src/howto/creator-external-tools.qdoc
View File

@@ -81,7 +81,7 @@
\section1 Using External Text Editors
You can open files for editing in the default text editor for your system:
Notepad on Windows and vi on Linux and OS X.
Notepad on Windows and vi on Linux and \macos.
To open the file you are currently viewing in an external editor, select
\uicontrol Tools > \uicontrol External > \uicontrol Text >
\uicontrol {Edit with Notepad} or \uicontrol {Edit with vi}, depending on
@@ -157,7 +157,7 @@
The tool configurations that you add and modify are stored in XML format in
the user configuration folder. For example,
\c {~/config/QtProject/qtcreator/externaltools}
on Linux and OS X and
on Linux and \macos and
\c {C:\Users\username\AppData\Roaming\QtProject\qtcreator\externaltools}
in Windows. To share a configuration with other users, copy an XML
configuration file to the folder.

12
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -200,19 +200,19 @@
\li Ctrl+6
\row
\li Toggle \uicontrol{Issues} pane
\li Alt+1 (Cmd+1 on OS X)
\li Alt+1 (Cmd+1 on \macos)
\row
\li Toggle \uicontrol{Search Results} pane
\li Alt+2 (Cmd+2 on OS X)
\li Alt+2 (Cmd+2 on \macos)
\row
\li Toggle \uicontrol{Application Output} pane
\li Alt+3 (Cmd+3 on OS X)
\li Alt+3 (Cmd+3 on \macos)
\row
\li Toggle \uicontrol{Compile Output} pane
\li Alt+4 (Cmd+4 on OS X)
\li Alt+4 (Cmd+4 on \macos)
\row
\li Toggle other output panes
\li Alt+number (Cmd+number on OS X)
\li Alt+number (Cmd+number on \macos)
Where the number is the number of the output pane.
\row
@@ -241,7 +241,7 @@
\li Ctrl+Shift+F11
\row
\li Toggle the sidebar
\li Alt+0 (Cmd+0 on OS X)
\li Alt+0 (Cmd+0 on \macos)
\row
\li Undo
\li Ctrl+Z

16
doc/src/howto/creator-tips.qdoc
View File

@@ -61,8 +61,8 @@
\key Ctrl+Tab.
To move forward in the location history, press \key {Alt+Right}
(\key {Cmd+Opt+Right} on OS X). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Left} on OS X). For example, if you use the \uicontrol Locator
(\key {Cmd+Opt+Right} on \macos). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Left} on \macos). For example, if you use the \uicontrol Locator
to jump to a symbol in the same file, you can jump back to your original
location in that file by pressing \key {Alt+Left}.
@@ -96,13 +96,13 @@
\list
\li \uicontrol{Issues} pane Alt+1 (Cmd+1 on OS X)
\li \uicontrol{Issues} pane Alt+1 (Cmd+1 on \macos)
\li \uicontrol{Search Results} pane Alt+2 (Cmd+2 on OS X)
\li \uicontrol{Search Results} pane Alt+2 (Cmd+2 on \macos)
\li \uicontrol{Application Output} pane Alt+3 (Cmd+3 on OS X)
\li \uicontrol{Application Output} pane Alt+3 (Cmd+3 on \macos)
\li \uicontrol{Compile Output} pane Alt+4 (Cmd+4 on OS X)
\li \uicontrol{Compile Output} pane Alt+4 (Cmd+4 on \macos)
\endlist
@@ -136,7 +136,7 @@
To toggle the sidebar in the \uicontrol Edit and \uicontrol Debug modes, click
\inlineimage sidebaricon.png
or press \key Alt+0 (\key Cmd+0 on OS X).
or press \key Alt+0 (\key Cmd+0 on \macos).
For more information on using the sidebar, see
\l {Browsing Project Contents}.
@@ -152,7 +152,7 @@
select the symbol in the list. For more information on using the locator,
see \l{Searching with the Locator}.
Press \key Ctrl (\key Cmd on OS X) and click a symbol to move directly to
Press \key Ctrl (\key Cmd on \macos) and click a symbol to move directly to
the definition or the declaration of the symbol. You can also move the
cursor on the symbol and press \key {F2}. For more information, see
\l{Moving to Symbol Definition or Declaration}.

4
doc/src/howto/creator-ui.qdoc
View File

@@ -157,7 +157,7 @@
\li To toggle the sidebar, click \inlineimage sidebaricon.png
(\uicontrol {Hide Sidebar/Show Sidebar}) or press \key Alt+0
(\key Cmd+0 on OS X).
(\key Cmd+0 on \macos).
\li To split the sidebar, click \inlineimage splitbutton_horizontal.png
(\uicontrol {Split}). Select new content to view in the split view.
@@ -574,7 +574,7 @@
\e options or \e preferences. In this manual, the names and locations on
Windows and Linux are usually used to keep the instructions short. Here are
some places to check if you cannot find a function, dialog, or keyboard
shortcut on OS X when following the instructions:
shortcut on \macos when following the instructions:
\table
\header

2
doc/src/howto/creator-vcs.qdoc
View File

@@ -668,7 +668,7 @@
To start a graphical interface to Git, select \uicontrol Tools > \uicontrol Git >
\uicontrol {Git Tools} > \uicontrol {Git Gui}.
\note On OS X, the default Git installation does not contain Git Gui. To
\note On \macos, the default Git installation does not contain Git Gui. To
use Git Gui, install it separately. To start Git Gui from \QC, select
\uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Git, and set the path to
the environment that contains Git Gui in the \uicontrol {Prepend to PATH} field.

10
doc/src/howto/qtcreator-faq.qdoc
View File

@@ -129,7 +129,7 @@
The location depends on the platform. On Linux and other Unix platforms, the files
are located in \c {~/.config/QtProject} and \c {~/.local/share/data/QtProject/qtcreator}.
On OS X, the files are located in \c {~/.config/QtProject} and
On \macos, the files are located in \c {~/.config/QtProject} and
\c {~/Library/Application Support/QtProject/Qt Creator}.
On Windows XP, the files are located in
@@ -152,7 +152,7 @@
for the application. Many plugins specify either the path to the tool they
need or the environment they run in.
This is especially relevant for the OS X where \c {/usr/local/bin} might
This is especially relevant for the \macos where \c {/usr/local/bin} might
not be in the path when \QC is started.
\b {How do I change the interface language for \QC?}
@@ -193,7 +193,7 @@
\b {If I have a choice of GDB versions, which should I use?}
On Linux and Windows, use the Python-enabled GDB versions that are
installed when you install \QC and \QSDK. On OS X, GDB is no longer
installed when you install \QC and \QSDK. On \macos, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
\l{https://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}.
@@ -218,7 +218,7 @@
\b {How can I make use of my multi-core CPU with \QC?}
On Linux and OS X, go to \uicontrol Project mode, select your configuration
On Linux and \macos, go to \uicontrol Project mode, select your configuration
in the \uicontrol {Build Settings}, locate the \uicontrol {Build Steps}, and add the
following value, where \c{<num>} is the amount of cores in your CPU:
\c{-j <num>}
@@ -259,7 +259,7 @@
\b {Where is application output shown in \QC?}
\b {On Unix (Linux and OS X):} \c qDebug() and related functions use
\b {On Unix (Linux and \macos):} \c qDebug() and related functions use
the standard output and error output. When you run or debug the
application, you can view the output in the \uicontrol{Application Output} pane.