diff options
Diffstat (limited to 'src/doc/src')
| -rw-r--r-- | src/doc/src/declarative/examples.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/declarative/extending-tutorial.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/declarative/pics/BorderImage.png | bin | 8094 -> 5112 bytes | |||
| -rw-r--r-- | src/doc/src/declarative/qmlviewer.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/declarative/qtquick-intro.qdoc | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/doc/src/declarative/examples.qdoc b/src/doc/src/declarative/examples.qdoc index 65599568..8743a6f1 100644 --- a/src/doc/src/declarative/examples.qdoc +++ b/src/doc/src/declarative/examples.qdoc @@ -43,7 +43,7 @@ To run the examples and demos, open them in Qt Creator or use the included qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml \endcode -On Mac OS X, you can run the included "QMLViewer" application from the +On OS X, you can run the included "QMLViewer" application from the Finder, or use the command line: \code diff --git a/src/doc/src/declarative/extending-tutorial.qdoc b/src/doc/src/declarative/extending-tutorial.qdoc index a759a655..98894fb5 100644 --- a/src/doc/src/declarative/extending-tutorial.qdoc +++ b/src/doc/src/declarative/extending-tutorial.qdoc @@ -443,7 +443,7 @@ the project and then load the QML file in the \l {QML Viewer}: qmlviewer app.qml \endcode -(On Mac OS X, you can launch the "QMLViewer" application instead.) +(On OS X, you can launch the "QMLViewer" application instead.) Notice the "import Charts 1.0" statement has disappeared from \c app.qml. This is because the \c qmldir file is in the same directory as \c app.qml: this is equivalent to diff --git a/src/doc/src/declarative/pics/BorderImage.png b/src/doc/src/declarative/pics/BorderImage.png Binary files differindex 651dd8aa..6620b2a2 100644 --- a/src/doc/src/declarative/pics/BorderImage.png +++ b/src/doc/src/declarative/pics/BorderImage.png diff --git a/src/doc/src/declarative/qmlviewer.qdoc b/src/doc/src/declarative/qmlviewer.qdoc index 0eafb89a..4df4af8a 100644 --- a/src/doc/src/declarative/qmlviewer.qdoc +++ b/src/doc/src/declarative/qmlviewer.qdoc @@ -50,7 +50,7 @@ file path on the command line: qmlviewer myqmlfile.qml \endcode -On Mac OS X, the QML Viewer application is named "QMLViewer" instead. You +On OS X, the QML Viewer application is named "QMLViewer" instead. You can launch the viewer by opening the QMLViewer application from the Finder, or from the command line: diff --git a/src/doc/src/declarative/qtquick-intro.qdoc b/src/doc/src/declarative/qtquick-intro.qdoc index 25b03838..a7deedf7 100644 --- a/src/doc/src/declarative/qtquick-intro.qdoc +++ b/src/doc/src/declarative/qtquick-intro.qdoc @@ -93,7 +93,7 @@ to export the design to Qt Quick Designer. features for completing code snippets, refactoring code, and viewing the element hierarchy of QML files. \li Build and deploy Qt Quick applications that target multiple desktop and -mobile platforms, such as Microsoft Windows, Mac OS X, Linux, Symbian, and +mobile platforms, such as Microsoft Windows, OS X, Linux, Symbian, and Maemo. \li Debug JavaScript functions and execute JavaScript expressions in the current context, and inspect QML at runtime to explore the object structure, debug |
