diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 09:48:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 10:00:18 +0100 |
| commit | 3d1d9aae2e977ef599582074e0f4faaef454a595 (patch) | |
| tree | 8cd2aaba4d0ba10c46abd6ce5c10a349d2889e75 /doc | |
| parent | 40ad7ec995332b043ead31ee0739f04dd7ac0e90 (diff) | |
| parent | e164717108176ee1423f3f629a8182520c2909d1 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/winrt/winrtdevicefactory.cpp
Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/howto/creator-help.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index 4bbfda9d02..51bf69b810 100644 --- a/doc/src/howto/creator-help.qdoc +++ b/doc/src/howto/creator-help.qdoc @@ -33,7 +33,7 @@ \contentspage index.html \page creator-help.html \if defined(qtdesignstudio) - \previouspage studio-tutorials.html + \previouspage {Examples and Tutorials} \nextpage studio-faq.html \else \previouspage creator-help-overview.html |