diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 23:15:11 +0200 |
| commit | 9f24bfd534dc27b76f95567aba1107a344ada400 (patch) | |
| tree | 9e9557f42862291467eab1dc084f2e1e12ad1952 /src/doc/src/declarative/extending-tutorial.qdoc | |
| parent | 05ec1a51988e0e7c02969f2662244aa2f4f5ffcf (diff) | |
| parent | 5eab543c5c955f5057225b9bdb6b2757516dbd3e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If9912b8068ded874986a4cc91c8ed8146900487f
Diffstat (limited to 'src/doc/src/declarative/extending-tutorial.qdoc')
| -rw-r--r-- | src/doc/src/declarative/extending-tutorial.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/src/declarative/extending-tutorial.qdoc b/src/doc/src/declarative/extending-tutorial.qdoc index 98894fb5..7c69d76e 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 OS X, you can launch the "QMLViewer" application instead.) +(On \macos, 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 |