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

Doc: replace "Mac OS (X)" with "OS X"

Browse Source 
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Leena Miettinen
2014-05-02 12:44:45 +02:00
parent 6eae258df2
commit d59d8b568d
28 changed files with 77 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/api/qtcreator-documentation.qdoc
View File

@@ -152,7 +152,7 @@
\section2 Taking Screen Shots
\QC has the native look and feel on Windows, Linux, and Mac OS, and
\QC has the native look and feel on Windows, Linux, and OS X, and
therefore, screen shots can end up looking very different, depending on who
takes them and which system they use. To try to preserve a consistent look
and feel in the \QC Manual, observe the guidelines listed in this section
@@ -201,7 +201,7 @@
Optimization should not visibly reduce image quality. If it does, do not do
it. You can use the Radical Image Optimization Tool (RIOT) on Windows (very
efficient) or ImageOptim on Mac OS (much less efficient), or some other tool
efficient) or ImageOptim on OS X (much less efficient), or some other tool
available on Linux.
With ImageOptim, you simply drag and drop the image files to the
@@ -276,7 +276,7 @@
\list
\li nmake docs (on Windows)
\li make docs (on Linux and Mac OS)
\li make docs (on Linux and OS X)
\endlist
@@ -285,7 +285,7 @@
\c {doc/html-dev} directory. The help files (.qch) are generated in the
\c {share/doc/qtcreator} directory in the \QC build directory on Windows and
Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
on Mac OS. You can view the HTML files in a browser and the help files in
on OS X. You can view the HTML files in a browser and the help files in
the \QC \gui Help mode. For more information about adding the help files to
\QC, see
\l{http://qt-project.org/doc/qtcreator-2.8/creator-help.html#adding-external-documentation}

6
doc/src/analyze/creator-valgrind.qdoc
View File

@@ -34,7 +34,7 @@
Valgrind tool suite to detect
problems that are related to memory management in applications.
\note Memcheck is supported locally on Linux and Mac OS. You can run it on
\note Memcheck is supported locally on Linux and OS X. You can run it on
a remote host from Windows.
After you download and install Valgrind tools, you can use Memcheck from
@@ -147,7 +147,7 @@
After you download and install Valgrind tools, you can use Callgrind from
\QC.
\note Callgrind is supported locally on Linux and Mac OS. You can run
\note Callgrind is supported locally on Linux and OS X. You can run
it on a remote Linux machine or device from any development machine.
To analyze applications:
@@ -264,7 +264,7 @@
\QC integrates Valgrind code analysis tools for detecting memory
leaks and profiling function execution. These tools are supported locally
only on Linux and Mac OS, but you can run them on a remote host from
only on Linux and OS X, but you can run them on a remote host from
Windows.
To run the Valgrind tools on a remote host over SSH:

23
doc/src/debugger/creator-debugger-setup.qdoc
View File

@@ -58,7 +58,8 @@
Server in Windows}.
\note To use the Free Software Foundation (FSF) version of GDB on
Mac OS, you must sign it and modify your \l{glossary-buildandrun-kit}{kit} settings.
OS X, you must sign it and modify your \l{glossary-buildandrun-kit}{kit}
settings.
This section explains the options you have for debugging C++ code
and provides installation notes for the supported native debuggers.
@@ -73,7 +74,7 @@
Qt Creator supports native debuggers when working with
compiled code. On most supported platforms, the GNU Symbolic Debugger
GDB can be used. On Microsoft Windows, when using the Microsoft tool chain
the Microsoft Console Debugger CDB, is needed. On Mac OS X, the LLDB
the Microsoft Console Debugger CDB, is needed. On OS X, the LLDB
debugger can be used. Basic support for LLDB is also available on Linux,
but it is restricted by LLDB's capabilities there, and considered
experimental.
@@ -94,7 +95,7 @@
\li GCC, ICC
\li GDB
\row
\li Mac OS X
\li OS X
\li GCC, Clang
\li LLDB, FSF GDB (experimental)
\row
@@ -122,7 +123,7 @@
\section2 Supported LLDB Versions
The LLDB native debugger has similar functionality to the GDB debugger.
LLDB is the default debugger in Xcode on Mac OS X for supporting C++ on the
LLDB is the default debugger in Xcode on OS X for supporting C++ on the
desktop. LLDB is typically used with the Clang compiler (even though you
can use it with GCC, too).
@@ -178,7 +179,7 @@
also build your own. Follow the instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}
{Building GDB}.
Builds of GDB shipped with Xcode on Mac OS X are no longer
Builds of GDB shipped with Xcode on OS X are no longer
supported.
\row
@@ -205,7 +206,7 @@
\l{Setting the Symbol Server in Windows}.
\row
\li Debugging tools for Mac OS X
\li Debugging tools for OS X
\li The Qt binary distribution contains both debug and release
variants of the libraries. But you have to explicitly tell the
runtime linker that you want to use the debug libraries even if
@@ -217,14 +218,10 @@
\gui Projects mode. In the run configuration, select
\gui{Use debug version of frameworks}.
For more detailed information about debugging on the Mac OS X,
For more detailed information about debugging on OS X,
see: \l{http://developer.apple.com/library/mac/#technotes/tn2124/_index.html#//apple_ref/doc/uid/DTS10003391}
{Mac OS X Debugging Magic}.
\note The Mac OS X Snow Leopard (10.6) has a bug that might cause the
application to crash. For a workaround, see:
\l{http://bugreports.qt-project.org/browse/QTBUG-4962}{QTBUG-4962}.
\row
\li LLDB
\li We recommend using the LLDB version that is delivered with Xcode 5.
@@ -276,9 +273,9 @@
\note The first time you start debugging by using the Debugging tools for
Windows, \QC prompts you to add the Symbol Server.
\section1 Setting up FSF GDB for Mac OS
\section1 Setting up FSF GDB for OS X
To use FSF GDB on Mac OS, you must sign it and add it to the \QC
To use FSF GDB on OS X, you must sign it and add it to the \QC
\l{glossary-buildandrun-kit}{kits}.
\list 1

29
doc/src/debugger/creator-debugger.qdoc
View File

@@ -514,7 +514,7 @@
\list
\li In the code editor, click the left margin or press \key F9
(\key F8 for Mac OS X) at a particular line you want the
(\key F8 for OS X) at a particular line you want the
program to stop.
\li In the \gui Breakpoints view, double-click in the empty
@@ -641,8 +641,8 @@
\li \b{Note:}
\row
\li GDB, and therefore \QC's debugger works for optimized
builds on Linux and Mac OS X. Optimization can lead to
\li GDB and LLDB, and therefore \QC's debugger, work for optimized
builds on Linux and OS X. Optimization can lead to
re-ordering of instructions or removal of some local variables,
causing the \gui{Locals and Expressions} view to show unexpected
data.
@@ -736,11 +736,11 @@
For more information, see \l{Using Command Line Options}.
\section2 Stepping into Frameworks in Mac OS
\section2 Stepping into Frameworks in OS X
In Mac OS X, external libraries are usually built into so-called Frameworks,
In OS X, external libraries are usually built into so-called Frameworks,
which may contain both release and debug versions of the library. When you run
applications on the Mac OS desktop, the release version of Frameworks is used
applications on the OS X desktop, the release version of Frameworks is used
by default. To step into Frameworks, select the \gui {Use debug versions of
Frameworks} option in the project run settings.
@@ -756,7 +756,7 @@
The \gui{Modules} view displays information that the debugger plugin has
about modules included in the application that is being debugged. A module
is a dynamic link library (.dll) in Windows, a shared object (.so) in
Linux, and a dynamic shared library (.dylib) in Mac OS.
Linux, and a dynamic shared library (.dylib) in OS X.
In addition, the view displays symbols within the modules and indicates
where each module was loaded.
@@ -1216,21 +1216,6 @@
and the evaluation of expressions after each step. We recommend that
you minimize the number of breakpoints and watched expressions.
\section1 Application Crashes when Debugging on Mac OS X Snow Leopard
You must use a workaround to use the DYLD_IMAGE_SUFFIX option in the
\gui Projects tab on Mac OS X Snow Leopard. For more information on the
issue, see
\l{http://wimleers.com/blog/dyld-image-suffix-causing-havoc-on-mac-os-x-snow-leopard}
{DYLD_IMAGE_SUFFIX causing havoc on Mac OS X Snow Leopard}.
To use the option, enter the following commands in the Terminal
application:
\code
sudo mv /usr/lib/libSystem.B_debug.dylib /usr/lib/libSystem.B_debug.dylib.backup
sudo cp /usr/lib/libSystem.B.dylib /usr/lib/libSystem.B_debug.dylib.backup
\endcode
\section1 Debugger Cannot Attach to Running Process on Linux
GDB uses \c ptrace to attach to running processes. Some Linux distributions

2
doc/src/editors/creator-coding-edit-mode.qdoc
View File

@@ -58,7 +58,7 @@
order.
To jump to a line and column in the current file, select the line and column
indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on Mac OS X) to open
indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on OS X) to open
the locator. Enter the line number and column number in the locator,
separated by a colon (:).

4
doc/src/editors/creator-editors.qdoc
View File

@@ -187,7 +187,7 @@
schemas. As a temporary solution, \QC looks for a JSON schema file with a
name that matches the name of the JSON instance file in the user
configuration folder. For example, \c {~/config/QtProject/qtcreator/json} on
Linux and Mac OS and
Linux and OS X and
\c {C:\Users\username\AppData\Roaming\QtCreator\qtcreator\json}
in Windows. To check JSON data structure, copy the JSON schema file to the
above folder.
@@ -2140,7 +2140,7 @@
\list
\li Press \key Ctrl+K (\key Cmd+K on Mac OS X).
\li Press \key Ctrl+K (\key Cmd+K on OS X).
\li Select \gui Tools > \gui Locate.

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

@@ -70,7 +70,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 Mac OS.
Notepad on Windows and vi on Linux and OS X.
To open the file you are currently viewing in an external editor, select
\gui Tools > \gui External > \gui Text > \gui {Edit with Notepad} or
\gui {Edit with vi}, depending on your system.
@@ -143,7 +143,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 Mac OS and
on Linux and OS X 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.

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

@@ -160,7 +160,7 @@
If you cannot find words that you know are there, indexing might not have
been completed for some reason. Remove the \c {.helpcollection} folder and
open the \gui Search pane again to recreate the index. The folder is located
in \c { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and Mac OS X and
in \c { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and OS X and
in \c {\AppData\Roaming\QtProject\qtcreator\} on Windows.
Punctuation is not included in indexed terms. To find terms that contain

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

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

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

@@ -55,8 +55,8 @@
\key Ctrl+Tab.
To move forward in the location history, press \key {Alt+Right}
(\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator
(\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 \gui 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}.
@@ -90,13 +90,13 @@
\list
\li \gui{Issues} pane Alt+1 (Cmd+1 on Mac OS X)
\li \gui{Issues} pane Alt+1 (Cmd+1 on OS X)
\li \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
\li \gui{Search Results} pane Alt+2 (Cmd+2 on OS X)
\li \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
\li \gui{Application Output} pane Alt+3 (Cmd+3 on OS X)
\li \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
\li \gui{Compile Output} pane Alt+4 (Cmd+4 on OS X)
\endlist
@@ -134,7 +134,7 @@
To toggle the sidebar in the \gui Edit and \gui Debug modes, click
\inlineimage qtcreator-togglebutton.png
or press \key Alt+0 (\key Cmd+0 on Mac OS X).
or press \key Alt+0 (\key Cmd+0 on OS X).
For more information on using the sidebar, see
\l {Browsing Project Contents}.
@@ -150,7 +150,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 Mac OS) and click a symbol to move directly to
Press \key Ctrl (\key Cmd on OS X) and click a symbol to move directly to
the definition or the declaration of the symbol. You can also move the
on the symbol and press \key {F2}. For more information, see
cursor \l{Moving to Symbol Definition or Declaration}.

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

@@ -144,7 +144,7 @@
\li To toggle the sidebar, click \inlineimage qtcreator-togglebutton.png
(\gui {Hide Sidebar/Show Sidebar}) or press \key Alt+0
(\key Cmd+0 on Mac OS X).
(\key Cmd+0 on OS X).
\li To split the sidebar, click \inlineimage qtcreator-splitbar.png
(\gui {Split}). Select new content to view in the split view.

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

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

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

@@ -57,7 +57,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 Mac OS, the files are located in \c {~/.config/QtProject} and
On OS X, the files are located in \c {~/.config/QtProject} and
\c {~/Library/Application Support/QtProject/Qt Creator}.
On Windows XP, the files are located in
@@ -80,7 +80,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 Mac OS where \c {/usr/local/bin} might
This is especially relevant for the OS X 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?}
@@ -121,7 +121,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 Mac OS X, GDB is no longer
installed when you install \QC and \QSDK. On OS X, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
@@ -146,7 +146,7 @@
\b {How can I make use of my multi-core CPU with \QC?}
On Linux and Mac OS X, go to \gui Project mode, select your configuration
On Linux and OS X, go to \gui Project mode, select your configuration
in the \gui {Build Settings}, locate the \gui {Build Steps}, and add the
following value, where \c{<num>} is the amount of cores in your CPU:
\c{-j <num>}
@@ -187,7 +187,7 @@
\b {Where is application output shown in \QC?}
\b {On Unix (Linux and Mac OS):} \c qDebug() and related functions use
\b {On Unix (Linux and OS X):} \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 \gui{Application Output} pane.

2
doc/src/ios/creator-ios-dev.qdoc
View File

@@ -28,7 +28,7 @@
You can connect iOS devices to a Mac computer with a USB cable to
build and run applications on them from \QC.
To be able to use \QC on Mac OS X, you must install Xcode, and therefore,
To be able to use \QC on OS X, you must install Xcode, and therefore,
you already have the tool chain for building applications for iOS. \QC
automatically detects the tool chain and creates the necessary
\l{glossary-buildandrun-kit}{kits} for building and running applications on

7
doc/src/overview/creator-supported-platforms.qdoc
View File

@@ -102,13 +102,12 @@
\endlist
\li Mac OS X 10.7 or later with the following:
\li OS X 10.7 or later with the following:
\list
\li Xcode tools for your Mac OS X version available from your
Mac OS X installation DVDs or at
\l http://developer.apple.com.
\li Xcode tools for your OS X version available on the
Mac App Store.
\endlist

2
doc/src/overview/creator-target-platforms.qdocinc
View File

@@ -29,7 +29,7 @@
\li {3,1} Development Platform
\header
\li Linux
\li Mac OS X
\li OS X
\li Windows
\row

4
doc/src/projects/creator-projects-compilers.qdoc
View File

@@ -44,7 +44,7 @@
\list
\li GNU Compiler Collection (GCC) is a compiler for Linux and
Mac OS X.
OS X.
\li MinGW (Minimalist GNU for Windows) is a native software port of GCC
and GNU Binutils for use in the development of native Microsoft
@@ -55,7 +55,7 @@
for Linux.
\li Clang is a C, C++, Objective C, and Objective C++ front-end for the
LLVM compiler for Windows, Linux, and Mac OS X.
LLVM compiler for Windows, Linux, and OS X.
\li QCC is the interface for compiling C++ applications for QNX.

2
doc/src/projects/creator-projects-debuggers.qdoc
View File

@@ -58,7 +58,7 @@
\li For GDB, specify the path to the GDB executable. The
executable must be built with Python scripting support
enabled (except when debugging on Mac OS). The options you
enabled. The options you
have depend on the development and target platform:
\list

6
doc/src/projects/creator-projects-libraries.qdoc
View File

@@ -56,10 +56,10 @@
(PRE_TARGETDEPS) in the project file.
Depending on the development platform, some options might be detected
automatically. For example, on Mac OS, the library type (\gui Library or
automatically. For example, on OS X, the library type (\gui Library or
\gui Framework) is detected automatically and the option is hidden. However,
if you develop on another platform than Mac OS and want to build your
project for the Mac OS, you must specify the library type.
if you develop on another platform than OS X and want to build your
project for OS X, you must specify the library type.
The default convention on Windows is that the debug and release versions
of a library have the same name, but are placed in different subdirectories,

7
doc/src/projects/creator-projects-settings-run-desktop.qdocinc
View File

@@ -11,12 +11,9 @@
\image qtcreator-pprunsettings.png
The \gui {Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)} option
(available on Mac OS, only) enables you to debug (for example, step into)
(only available on OS X) enables you to debug (for example, step into)
linked frameworks, such as the Qt framework itself. You do not need this
option for debugging your application code. If you select this option, a
crash might occur when debugging applications on Mac OS X Snow Leopard. For
more information, see
\l{Application Crashes when Debugging on Mac OS X Snow Leopard}.
option for debugging your application code.
You can also create custom executable run configurations where you
can set the executable to be run. For more information, see

2
doc/src/qnx/creator-developing-qnx.qdoc
View File

@@ -50,7 +50,7 @@
To enable access over USB, change \gui{Preferences > Storage & Sharing >
USB Connections} to \gui{Connect to Windows} if you are deploying from
Windows, or \gui{Connect to Mac} if you are deploying from Linux or Mac OS.
Windows, or \gui{Connect to Mac} if you are deploying from Linux or OS X.
\image qtcreator-qnx-playbook-storage-sharing.png

2
doc/src/qnx/creator-projects-running-qnx.qdocinc
View File

@@ -24,7 +24,7 @@
application views are displayed on the device. Standard output is
visible in the \QC \gui {Application Output} view.
\note Debugging is currently only fully supported on Linux and Mac OS.
\note Debugging is currently only fully supported on Linux and OS X.
It is not possible to insert breakpoints during runtime on Windows.
\section2 Troubleshooting Errors

2
doc/src/qtcreator.qdoc
View File

@@ -33,7 +33,7 @@
\QC provides a cross-platform, complete integrated development environment
(IDE) for application developers to create applications for multiple desktop
and mobile device platforms, such as \l{Connecting Android Devices}{Android}
and \l{Connecting iOS Devices}{iOS}. It is available for Linux, Mac OS X and
and \l{Connecting iOS Devices}{iOS}. It is available for Linux, OS X and
Windows
operating systems. For more information, see \l{Supported Platforms}.

4
doc/src/qtquick/creator-mobile-app-tutorial.qdoc
View File

@@ -68,7 +68,7 @@
\li In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next} (or
\gui Continue on Mac OS X).
\gui Continue on OS X).
\li In the \gui {Qt Quick component set} field, select
\gui {Qt Quick Controls 1.1}.
@@ -83,7 +83,7 @@
settings.
\li Review the project settings, and click \gui{Finish} (or \gui Done on
Mac OS X).
OS X).
\endlist

4
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -54,7 +54,7 @@
\li In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
Windows and Linux) or \gui Continue (on Mac OS).
Windows and Linux) or \gui Continue (on OS X).
\li In the \gui {Qt Quick component set} field, select
\gui {Qt Quick 2.1}.
@@ -69,7 +69,7 @@
settings.
\li Review the project settings, and click \gui{Finish} (on Windows and
Linux) or \gui Done (on Mac OS) to create the project.
Linux) or \gui Done (on OS X) to create the project.
\li Press \key {Ctrl+R} (or \key {Cmd+R}) to run the application.

2
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -121,7 +121,7 @@
\gui Options > \gui {Build & Run} > \gui Kits.
\li Review the project settings, and click \gui{Finish} (on Windows and
Linux) or \gui Done (on Mac OS) to create the project.
Linux) or \gui Done (on OS X) to create the project.
\endlist

6
doc/src/widgets/qtdesigner-app-tutorial.qdoc
View File

@@ -54,7 +54,7 @@
\li In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
Windows and Linux) or \gui Continue (on Mac OS).
Windows and Linux) or \gui Continue (on OS X).
The \gui {Kit Selection} dialog opens.
@@ -87,7 +87,7 @@
\image qtcreator-new-project-summary-qt-gui.png "Project Management dialog"
\li Review the project settings, and click \gui{Finish} (on Windows and
Linux) or \gui Done (on Mac OS) to create the project.
Linux) or \gui Done (on OS X) to create the project.
\endlist
@@ -156,7 +156,7 @@
\li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
click \gui{Lay out Horizontally} (or press \gui{Ctrl+H} on Linux or
Windows or \key {Ctrl+Shift+H} on Mac OS) to apply a horizontal
Windows or \key {Ctrl+Shift+H} on OS X) to apply a horizontal
layout (QHBoxLayout).
\image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout"

4
doc/src/widgets/qtdesigner-plugins.qdoc
View File

@@ -52,7 +52,7 @@
The integrated \QD fetches plugins from the \c {%SDK%\bin\designer} folder
on Windows and Linux. For information about how to configure plugins on
Mac OS, see \l{Configuring Qt Designer Plugins on Mac OS}.
OS X, see \l{Configuring Qt Designer Plugins on OS X}.
To check which plugins
were loaded successfully and which failed, choose \gui{Tools > Form Editor >
@@ -64,7 +64,7 @@
were loaded successfully and which failed, choose \gui{Help >
About Plugins}.
\section2 Configuring Qt Designer Plugins on Mac OS
\section2 Configuring Qt Designer Plugins on OS X
On the Mac, a GUI application must be built and run from a bundle. A bundle
is a directory structure that appears as a single entity when viewed in the