aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src/widgets
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2014-05-02 12:44:45 +0200
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2014-05-06 09:35:45 +0200
commitd59d8b568d73ae895c1eb87684ac67940496a49b (patch)
tree49246e4892a64ee76270b49fca9c752d0a434cbf /doc/src/widgets
parent6eae258df2a6dff4fc32394286280c2e6cfd09c5 (diff)
Doc: replace "Mac OS (X)" with "OS X"
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'doc/src/widgets')
-rw-r--r--doc/src/widgets/qtdesigner-app-tutorial.qdoc6
-rw-r--r--doc/src/widgets/qtdesigner-plugins.qdoc4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index de1046e472..ee94572578 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -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"
diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc
index 0b18eaaeb3..accf991c19 100644
--- a/doc/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/src/widgets/qtdesigner-plugins.qdoc
@@ -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