diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-08 07:36:31 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-08 07:36:36 +0200 |
| commit | c6125f279063366ada1c32d76018a2f7c722abf0 (patch) | |
| tree | b7c4db3755adb5404d753df5f05251bad0f8fb4b /doc | |
| parent | 9e2c0f55f2888afda5c40988653feeac8bdbf5c0 (diff) | |
| parent | 7dbea56b9c1ca41fb0408689a73f61a4c59ff962 (diff) | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I8cc26f38a0ac2453c81108e449b6d84efc9e419c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/style/qt5-sidebar.html | 2 | ||||
| -rw-r--r-- | doc/src/widgets/qtdesigner-plugins.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/config/style/qt5-sidebar.html b/doc/config/style/qt5-sidebar.html index 531262ab5b..0069cb9709 100644 --- a/doc/config/style/qt5-sidebar.html +++ b/doc/config/style/qt5-sidebar.html @@ -10,7 +10,7 @@ <li><a href="creator-design-mode.html">Designing User Interfaces</a></li> <li><a href="creator-coding.html">Coding</a></li> <li><a href="creator-building-running.html">Building and Running</a></li> - <li><a href="creator-testing.html">Debugging and Analyzing</a></li> + <li><a href="creator-testing.html">Testing</a></li> <li><a href="creator-advanced.html">Advanced Use</a></li> <li><a href="creator-help-overview.html">Getting Help</a></li> </ul> diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc index 3925e86e3e..e696d5cd5f 100644 --- a/doc/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/src/widgets/qtdesigner-plugins.qdoc @@ -101,9 +101,9 @@ \list \li \c {libqwt_designer_plugin.dylib} to - \c {QtCreator.app/Contents/MacOS/designer} + \c {Qt Creator.app/Contents/PlugIns/designer} - \li \c {libqwt.*.dylib} to \c {QtCreator.app/Contents/Frameworks} + \li \c {libqwt.*.dylib} to \c {Qt Creator.app/Contents/Frameworks} \endlist |