diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
| commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
| tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/qml/doc/src/cppintegration | |
| parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
| parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/extending-tutorial.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index c0cfc3e1aa..58cc650e01 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -389,7 +389,7 @@ directory. When building this example on Windows or Linux, the \c Charts directory will be located at the same level as the application that uses our new import module. This way, the QML engine will find our module as the default search path for QML -imports includes the directory of the application executable. On OS X, the +imports includes the directory of the application executable. On \macos, the plugin binary is copied to \c Contents/PlugIns in the the application bundle; this path is set in \l {tutorials/extending-qml/chapter6-plugins/app.pro} {chapter6-plugins/app.pro}: |