diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
commit | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (patch) | |
tree | d2609e5bd0f67e9c4b0a2e3a362defcf7549a6ba /src/doc/src/declarative/extending-tutorial.qdoc | |
parent | ef57010bec52f0d39840e629b2b47f6f56fc337b (diff) | |
parent | f079636a3ee5538eb79fd4e7e6ffcb0465a015a0 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6.0
Conflicts:
.qmake.conf
Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
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 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 |