diff options
Diffstat (limited to 'doc')
99 files changed, 147 insertions, 153 deletions
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 21b61a87f7..00dd6a5953 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -21,8 +21,7 @@ macro.QD = "Qt Designer" macro.QL = "Qt Linguist" macro.QMLD = "Qt Quick Designer" macro.QQV = "Qt QML Viewer" -macro.QS = "Qt Simulator" -macro.QSDK = "Qt SDK" +macro.QSDK = "Qt" macro.qtcversion = $QTC_VERSION macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc index c5f97e68ed..a3663c87c4 100644 --- a/doc/src/analyze/creator-analyze.qdoc +++ b/doc/src/analyze/creator-analyze.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-troubleshooting-debugging.html \page creator-analyze-mode.html \nextpage creator-qml-performance-monitor.html diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc index 1fb1b4e29a..561a1c0219 100644 --- a/doc/src/analyze/creator-valgrind-overview.qdoc +++ b/doc/src/analyze/creator-valgrind-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-qml-performance-monitor.html \page creator-valgrind-overview.html \nextpage creator-analyzer.html diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc index 98b70d1c46..6f65d377d3 100644 --- a/doc/src/analyze/creator-valgrind.qdoc +++ b/doc/src/analyze/creator-valgrind.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-valgrind-overview.html \page creator-analyzer.html \nextpage creator-cache-profiler.html @@ -133,7 +133,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-analyzer.html \page creator-cache-profiler.html \nextpage creator-running-valgrind-remotely.html @@ -255,7 +255,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-cache-profiler.html \page creator-running-valgrind-remotely.html \nextpage creator-advanced.html diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index 777ca4b923..4a58f0496c 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-analyze-mode.html \page creator-qml-performance-monitor.html \nextpage creator-valgrind-overview.html diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 70d923cb93..8efeae6266 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-connecting-mobile.html \page creator-developing-android.html \nextpage creator-developing-baremetal.html diff --git a/doc/src/android/creator-android-app-tutorial.qdoc b/doc/src/android/creator-android-app-tutorial.qdoc index 03b2a0cee0..79ca7f474e 100644 --- a/doc/src/android/creator-android-app-tutorial.qdoc +++ b/doc/src/android/creator-android-app-tutorial.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-writing-program.html \page creator-android-app-tutorial.html \nextpage creator-project-managing.html diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index 6046175c8d..6d3ea1333b 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-deployment.html \page creator-deploying-android.html \nextpage creator-deployment-bb10.html diff --git a/doc/src/baremetal/creator-baremetal-dev.qdoc b/doc/src/baremetal/creator-baremetal-dev.qdoc index 9d3ee77005..5d9df8b32c 100644 --- a/doc/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/src/baremetal/creator-baremetal-dev.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-android.html \page creator-developing-baremetal.html \nextpage creator-developing-bb10.html diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-debugger-example.qdoc index 6bed94be5b..d944057824 100644 --- a/doc/src/debugger/creator-debugger-example.qdoc +++ b/doc/src/debugger/creator-debugger-example.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugging-qml.html \page creator-debugging-example.html \nextpage creator-qml-debugging-example.html diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index 8361be90a6..a6c709ef2a 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugging.html \page creator-debugger-engines.html \nextpage creator-debugger-operating-modes.html diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 45f01ed53a..1a78a06006 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-testing.html \page creator-debugging.html \nextpage creator-debugger-engines.html @@ -91,7 +91,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugger-engines.html \page creator-debugger-operating-modes.html \nextpage creator-debug-mode.html @@ -352,7 +352,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugger-operating-modes.html \page creator-debug-mode.html \nextpage creator-debugging-helpers.html @@ -814,7 +814,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debug-mode.html \page creator-debugging-helpers.html \nextpage creator-debugging-qml.html @@ -1130,7 +1130,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-qml-debugging-example.html \page creator-troubleshooting-debugging.html \nextpage creator-analyze-mode.html diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc index 98fbbf332f..8f30974234 100644 --- a/doc/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/src/debugger/qtquick-debugger-example.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugging-example.html \page creator-qml-debugging-example.html \nextpage creator-troubleshooting-debugging.html diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index 3bf174776f..7bb43fb065 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debugging-helpers.html \page creator-debugging-qml.html \nextpage creator-debugging-example.html diff --git a/doc/src/editors/creator-beautifier.qdoc b/doc/src/editors/creator-beautifier.qdoc index 448b3c578c..c738748847 100644 --- a/doc/src/editors/creator-beautifier.qdoc +++ b/doc/src/editors/creator-beautifier.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-refactoring.html \page creator-beautifier.html \nextpage creator-editor-options.html diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc index 68543293ea..6b35d0b55a 100644 --- a/doc/src/editors/creator-clang-codemodel.qdoc +++ b/doc/src/editors/creator-clang-codemodel.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-diff-editor.html \page creator-clang-codemodel.html \nextpage creator-finding-overview.html diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 428a659f0f..4d7458abcd 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-functions.html \page creator-coding-navigating.html \nextpage creator-highlighting.html diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc index f5cb4224a9..fe2373125c 100644 --- a/doc/src/editors/creator-coding.qdoc +++ b/doc/src/editors/creator-coding.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-usability.html \page creator-coding.html \nextpage creator-editor-functions.html diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index 7e3169ca64..b7b85510ed 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-macros.html \page creator-diff-editor.html \nextpage creator-clang-codemodel.html diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc index 042f655787..a4b51f5919 100644 --- a/doc/src/editors/creator-editors-options-text.qdoc +++ b/doc/src/editors/creator-editors-options-text.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-options.html \page creator-editor-options-text.html \nextpage creator-editor-fakevim.html diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/src/editors/creator-editors-options.qdoc index ae08313a77..cf77040f6b 100644 --- a/doc/src/editors/creator-editors-options.qdoc +++ b/doc/src/editors/creator-editors-options.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-beautifier.html \page creator-editor-options.html \nextpage creator-editor-options-text.html diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc index 7043d44197..e46fa3e5ca 100644 --- a/doc/src/editors/creator-editors-writing-code.qdoc +++ b/doc/src/editors/creator-editors-writing-code.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-coding.html \page creator-editor-functions.html \nextpage creator-coding-navigating.html diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index da5a4e94af..23653eb061 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-coding-navigating.html \page creator-highlighting.html \nextpage creator-checking-code-syntax.html @@ -139,7 +139,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-highlighting.html \page creator-checking-code-syntax.html \nextpage creator-completing-code.html @@ -677,7 +677,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-checking-code-syntax.html \page creator-completing-code.html \nextpage creator-indenting-code.html @@ -886,7 +886,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage qt-quick-toolbars.html \page creator-editor-codepasting.html \nextpage creator-macros.html @@ -971,7 +971,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-codepasting.html \page creator-macros.html \nextpage creator-diff-editor.html @@ -1003,7 +1003,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-options-text.html \page creator-editor-fakevim.html \nextpage creator-mime-types.html @@ -1052,7 +1052,7 @@ */ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-completing-code.html \page creator-indenting-code.html \nextpage qt-quick-toolbars.html @@ -1275,7 +1275,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-finding-overview.html \page creator-editor-finding.html \nextpage creator-editor-locator.html @@ -1427,7 +1427,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-locator.html \page creator-editor-refactoring.html \nextpage creator-beautifier.html @@ -2125,7 +2125,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-finding.html \page creator-editor-locator.html \nextpage creator-editor-refactoring.html diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index cd1e07fb55..6462e70dd1 100644 --- a/doc/src/editors/creator-finding.qdoc +++ b/doc/src/editors/creator-finding.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-clang-codemodel.html \page creator-finding-overview.html \nextpage creator-editor-finding.html diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-mime-types.qdoc index ae7c203ef2..9280fa8128 100644 --- a/doc/src/editors/creator-mime-types.qdoc +++ b/doc/src/editors/creator-mime-types.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-fakevim.html \page creator-mime-types.html \nextpage creator-building-running.html diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc index 6f138e24bf..0f4b0f26a6 100644 --- a/doc/src/howto/creator-cli.qdoc +++ b/doc/src/howto/creator-cli.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-generic.html \page creator-cli.html \nextpage creator-keyboard-shortcuts.html diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index 72a37ced8e..eac406061b 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-keyboard-shortcuts.html \page creator-editor-external.html \nextpage creator-task-lists.html diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index faf0de9a19..2f0cf81205 100644 --- a/doc/src/howto/creator-help.qdoc +++ b/doc/src/howto/creator-help.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-help-overview.html \page creator-help.html \nextpage creator-faq.html diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc index b3021f2529..df4624de5c 100644 --- a/doc/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-cli.html \page creator-keyboard-shortcuts.html \nextpage creator-editor-external.html diff --git a/doc/src/howto/creator-sessions.qdoc b/doc/src/howto/creator-sessions.qdoc index 67a1e5c317..34235b9c07 100644 --- a/doc/src/howto/creator-sessions.qdoc +++ b/doc/src/howto/creator-sessions.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-sharing-project-settings.html \page creator-project-managing-sessions.html \nextpage creator-design-mode.html diff --git a/doc/src/howto/creator-task-lists.qdoc b/doc/src/howto/creator-task-lists.qdoc index 92764c557a..ec6b05d1aa 100644 --- a/doc/src/howto/creator-task-lists.qdoc +++ b/doc/src/howto/creator-task-lists.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-external.html \page creator-task-lists.html \nextpage creator-help-overview.html diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc index 6a6e6ec85b..5d9fe7fb31 100644 --- a/doc/src/howto/creator-tips.qdoc +++ b/doc/src/howto/creator-tips.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-faq.html \page creator-tips.html \nextpage creator-known-issues.html diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index f4aa2f002e..3e2bdfec8c 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-overview.html \page creator-quick-tour.html \nextpage creator-configuring.html diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index faec850b9f..50f9fb54ad 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-wizards.html \page creator-version-control.html \nextpage creator-configuring-projects.html diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index c2e2fb6ef2..8dc656d871 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -17,7 +17,7 @@ ****************************************************************************/ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-help.html \page creator-faq.html \nextpage creator-tips.html @@ -105,7 +105,7 @@ \QC comes fully integrated with Qt documentation and examples using the Qt Help plugin. The integrated Qt Reference Documentation is available - for Qt 4.4 and later. \QC, \QSDK, and other Qt deliverables contain + for Qt 4.4 and later. \QC and other Qt deliverables contain documentation as .qch files. All the documentation is accessible in the \gui Help mode. @@ -121,9 +121,9 @@ \b {If I have a choice of GDB versions, which should I use?} On Linux and Windows, use the Python-enabled GDB versions that are - installed when you install \QC and Qt SDK. On Mac OS X, use the GDB - provided with Xcode. For a custom target, you can build your own - Python-enabled GDB. Follow the instructions in + installed when you install \QC and \QSDK. On Mac OS X, GDB is no longer + officially supported. To build your own Python-enabled GDB, follow the + instructions in \l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}. You must use Python version 2.6 or 2.7. @@ -161,11 +161,12 @@ many parallel processes as your CPU has cores. You can override this behavior by using the \c{-j} parameter as described above. - \section1 Qt SDK Questions + \section1 Qt Installation Questions - \b {I cannot use QSslSocket with the SDK. What should I do?} + \b {I cannot use QSslSocket with the Qt I installed from binary packages. + What should I do?} - The Qt build in the SDK is built with QT_NO_OPENSSL defined. Rebuilding it + The Qt in the binary packages is built with QT_NO_OPENSSL defined. Rebuilding it is possible. For more information, see \l{http://www.qtcentre.org/threads/19222-Qssl}. diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/src/ios/creator-ios-dev.qdoc index 6cd6cbc948..218c48ac44 100644 --- a/doc/src/ios/creator-ios-dev.qdoc +++ b/doc/src/ios/creator-ios-dev.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-generic-linux.html \page creator-developing-ios.html \nextpage creator-developing-qnx.html diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index 52e6464450..ec6df11604 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-deployment-bb10.html \page creator-deployment-maemo.html \nextpage creator-deployment-qnx.html diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 7aeb8ce6c8..74367cd249 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-bb10.html \page creator-developing-generic-linux.html \nextpage creator-developing-ios.html diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc index 855f213cf3..00fc60109f 100644 --- a/doc/src/overview/creator-acknowledgements.qdoc +++ b/doc/src/overview/creator-acknowledgements.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage technical-support.html \page creator-acknowledgements.html diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index 6ce8b4ff29..8c5a5e6e45 100644 --- a/doc/src/overview/creator-advanced.qdoc +++ b/doc/src/overview/creator-advanced.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-running-valgrind-remotely.html \page creator-advanced.html \nextpage creator-os-supported-platforms.html diff --git a/doc/src/overview/creator-configuring.qdoc b/doc/src/overview/creator-configuring.qdoc index 54e3b270d1..e3d882581b 100644 --- a/doc/src/overview/creator-configuring.qdoc +++ b/doc/src/overview/creator-configuring.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-quick-tour.html \page creator-configuring.html \nextpage creator-build-example-application.html diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index f41f35932c..d2d0f9654d 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-running-targets.html \page creator-deployment.html \nextpage creator-deploying-android.html diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc index 0f713757b0..26ad72a219 100644 --- a/doc/src/overview/creator-design-overview.qdoc +++ b/doc/src/overview/creator-design-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-managing-sessions.html \page creator-design-mode.html \nextpage creator-visual-editor.html diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-getting-started.qdoc index 8007866199..240212bf65 100644 --- a/doc/src/overview/creator-getting-started.qdoc +++ b/doc/src/overview/creator-getting-started.qdoc @@ -23,8 +23,8 @@ // ********************************************************************** /*! - \contentspage index.html - \previouspage index.html + \contentspage {Qt Creator Manual} + \previouspage {Qt Creator Manual} \page creator-getting-started.html \nextpage creator-overview.html diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc index 57f5b20b65..b7aaba3732 100644 --- a/doc/src/overview/creator-glossary.qdoc +++ b/doc/src/overview/creator-glossary.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-known-issues.html \page creator-glossary.html \nextpage technical-support.html diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-help-overview.qdoc index 1d33e57e59..e1001a0104 100644 --- a/doc/src/overview/creator-help-overview.qdoc +++ b/doc/src/overview/creator-help-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-task-lists.html \page creator-help-overview.html \nextpage creator-help.html diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc index 0816b1fd9b..69a30c571f 100644 --- a/doc/src/overview/creator-issues.qdoc +++ b/doc/src/overview/creator-issues.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-tips.html \page creator-known-issues.html \nextpage creator-glossary.html diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index 88bbe70df4..7cfb47883c 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-deployment-qnx.html \page creator-connecting-mobile.html \nextpage creator-developing-android.html @@ -31,10 +31,9 @@ \title Connecting Mobile Devices You can connect mobile devices to the development PC to build, run, debug, - and analyze applications on them from \QC. When you install an SDK for a + and analyze applications on them from \QC. When you install Qt for a target platform, such as Android or QNX, the build and run settings for the - development targets delivered with the SDK might be set up automatically in - \QC. + development targets might be set up automatically in \QC. You can connect the device to the development PC using a USB connection. Additionally, you can connect Linux-based devices by using a WLAN @@ -45,12 +44,12 @@ \li \l{Connecting Android Devices} Qt applications for Android are compiled as \c {shared objects} that - are loaded by a Java launcher generated by the Qt for Android SDK. + are loaded by a Java launcher that is part of Qt. This is totally transparent to users. As Qt is composed of libraries referencing each other, Qt 4 applications are only supported on Android version 1.6, or later, and Qt 5 applications on version - 2.3.3, or later. You must install the Qt for Android SDK to develop - for Android devices. + 2.3.3, or later. You must install a Qt version targeting Android and + the Android SDK and NDK to develop for Android devices. \li \l{Connecting Bare Metal Devices} diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc index b92186ee5e..7e5cebd690 100644 --- a/doc/src/overview/creator-overview.qdoc +++ b/doc/src/overview/creator-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-getting-started.html \page creator-overview.html \nextpage creator-quick-tour.html diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-supported-platforms.qdoc index e7980e5649..7f95700d87 100644 --- a/doc/src/overview/creator-supported-platforms.qdoc +++ b/doc/src/overview/creator-supported-platforms.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-advanced.html \page creator-os-supported-platforms.html \nextpage creator-project-other.html diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc index afbadea5ef..f14522c320 100644 --- a/doc/src/overview/creator-target-platforms.qdocinc +++ b/doc/src/overview/creator-target-platforms.qdocinc @@ -64,10 +64,6 @@ \li Yes \endtable - \note Symbian support has been removed from \QC 2.6. To develop for Symbian, - install \QSDK 1.2.1 or \QSDK 1.1.2 (that contains the Qt 4.6.3 for Symbian - and Qt 4.7.3 for Symbian^3 and Symbian Anna targets) and use \QC 2.4. - \note Madde support has been removed from \QC 3.0. To develop for Maemo or Harmattan, - install \QSDK 1.2.1 or \QSDK 1.1.2 and use \QC 2.8. + use \QC 2.8. diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index ebd7f5f576..787944c47b 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-glossary.html \page technical-support.html \nextpage creator-acknowledgements.html diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc index d25fbecbe1..97b133727c 100644 --- a/doc/src/overview/creator-testing.qdoc +++ b/doc/src/overview/creator-testing.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-build-process-customizing.html \page creator-testing.html \nextpage creator-debugging.html diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc index 7c38ce8a3b..c4797e8a09 100644 --- a/doc/src/overview/creator-tutorials.qdoc +++ b/doc/src/overview/creator-tutorials.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-build-example-application.html \page creator-tutorials.html \nextpage creator-qml-application.html diff --git a/doc/src/overview/mobile-app-design.qdoc b/doc/src/overview/mobile-app-design.qdoc index 9e6a479fe8..2dc6767b28 100644 --- a/doc/src/overview/mobile-app-design.qdoc +++ b/doc/src/overview/mobile-app-design.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage adding-plugins.html \page creator-usability.html \nextpage creator-coding.html diff --git a/doc/src/projects/creator-projects-autotools.qdoc b/doc/src/projects/creator-projects-autotools.qdoc index d5720b71c5..454ef4120f 100644 --- a/doc/src/projects/creator-projects-autotools.qdoc +++ b/doc/src/projects/creator-projects-autotools.qdoc @@ -31,7 +31,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-qbs.html \page creator-projects-autotools.html \nextpage creator-project-generic.html diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index 451dd48190..0babbea672 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-configuring.html \page creator-build-example-application.html \nextpage creator-tutorials.html diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc index bc937093d9..aded8507b4 100644 --- a/doc/src/projects/creator-projects-building-running.qdoc +++ b/doc/src/projects/creator-projects-building-running.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-mime-types.html \page creator-building-running.html \nextpage creator-building-targets.html @@ -63,7 +63,7 @@ \li \l{Connecting Mobile Devices} - When you install tool chains for device types as part of an SDK, + When you install tool chains for device types as part of a Qt distribution, the build and run settings for mobile device types might be set up automatically. However, you might need to install and configure some additional software on the devices to be able to connect to them diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc index 0c11a88656..ccbedf5770 100644 --- a/doc/src/projects/creator-projects-building.qdoc +++ b/doc/src/projects/creator-projects-building.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-building-running.html \page creator-building-targets.html \nextpage creator-running-targets.html diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index 2b31513098..ef05e84a45 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-winrt.html \page creator-build-process-customizing.html \nextpage creator-testing.html diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc index 54d903e6de..274d497975 100644 --- a/doc/src/projects/creator-projects-cmake.qdoc +++ b/doc/src/projects/creator-projects-cmake.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-other.html \page creator-project-cmake.html \nextpage creator-project-qbs.html diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc index 261e788a93..345ef9565d 100644 --- a/doc/src/projects/creator-projects-compilers.qdoc +++ b/doc/src/projects/creator-projects-compilers.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-qmake.html \page creator-tool-chains.html \nextpage creator-debuggers.html @@ -37,7 +37,7 @@ application on a particular platform. \QC automatically detects the compilers that are registered by your system - or by an SDK. You can add compilers to build applications by using other + or by an installer. You can add compilers to build applications by using other compilers or by using additional versions of the automatically detected compilers: @@ -49,7 +49,7 @@ \li MinGW (Minimalist GNU for Windows) is a native software port of GCC and GNU Binutils for use in the development of native Microsoft Windows applications on Windows. MinGW is - distributed together with \QC and Qt SDK for Windows. + distributed together with \QC and Qt installers for Windows. \li Linux ICC (Intel C++ Compiler) is a group of C and C++ compilers for Linux. diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index dbf3584a45..6eed341797 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-managing.html \page creator-project-creating.html \nextpage creator-project-opening.html @@ -65,8 +65,8 @@ use \QC as a code editor and to fully control the steps and commands used to build the project. - You can install tools for mobile devices - as part of an SDK. The \l{glossary-buildandrun-kit}{kits} and build and run settings for the + You can install tools for mobile devices as part of Qt distributions. + The \l{glossary-buildandrun-kit}{kits} and build and run settings for the installed device types are set up automatically. However, you might need to install and configure some additional software on the devices to be able to connect to them from the development PC. diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc index cc3fd89e74..d9c0a72bef 100644 --- a/doc/src/projects/creator-projects-custom-wizards.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-qmake-libraries.html \page creator-project-wizards.html \nextpage creator-version-control.html diff --git a/doc/src/projects/creator-projects-debuggers.qdoc b/doc/src/projects/creator-projects-debuggers.qdoc index 9fbd3769d1..20ca18740b 100644 --- a/doc/src/projects/creator-projects-debuggers.qdoc +++ b/doc/src/projects/creator-projects-debuggers.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-tool-chains.html \page creator-debuggers.html \nextpage creator-build-settings.html diff --git a/doc/src/projects/creator-projects-generic.qdoc b/doc/src/projects/creator-projects-generic.qdoc index 43275d63d1..51af31f7eb 100644 --- a/doc/src/projects/creator-projects-generic.qdoc +++ b/doc/src/projects/creator-projects-generic.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-projects-autotools.html \page creator-project-generic.html \nextpage creator-cli.html diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc index 79bfac1ca9..950686e9e2 100644 --- a/doc/src/projects/creator-projects-libraries.qdoc +++ b/doc/src/projects/creator-projects-libraries.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-opening.html \page creator-project-qmake-libraries.html \nextpage creator-project-wizards.html diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc index 22bbebfe56..924b8488e7 100644 --- a/doc/src/projects/creator-projects-opening.qdoc +++ b/doc/src/projects/creator-projects-opening.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-creating.html \page creator-project-opening.html \nextpage creator-project-qmake-libraries.html diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-projects-other.qdoc index 7e3cf586da..558a441593 100644 --- a/doc/src/projects/creator-projects-other.qdoc +++ b/doc/src/projects/creator-projects-other.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-os-supported-platforms.html \page creator-project-other.html \nextpage creator-project-cmake.html diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc index 5ab60cb88e..b8f8b55c96 100644 --- a/doc/src/projects/creator-projects-overview.qdoc +++ b/doc/src/projects/creator-projects-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-android-app-tutorial.html \page creator-project-managing.html \nextpage creator-project-creating.html diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc index 0c39b11baf..a04763e50d 100644 --- a/doc/src/projects/creator-projects-qbs.qdoc +++ b/doc/src/projects/creator-projects-qbs.qdoc @@ -17,7 +17,7 @@ ****************************************************************************/ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-project-cmake.html \page creator-project-qbs.html \nextpage creator-projects-autotools.html diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc index 8d5bfdc4e5..8f86f9af80 100644 --- a/doc/src/projects/creator-projects-qt-versions.qdoc +++ b/doc/src/projects/creator-projects-qt-versions.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-targets.html \page creator-project-qmake.html \nextpage creator-tool-chains.html @@ -32,11 +32,11 @@ \QC allows you to have multiple versions of Qt installed on your development PC and use different versions to build your projects. - For example, Qt 4 SDK contains special Qt versions for developing applications - for mobile devices. + For example, device manufacturers provide special Qt versions for developing + applications for their devices. \QC automatically detects the Qt versions that are registered by - your system or by \QSDK. To view detailed information for each Qt + your system or by installers. To view detailed information for each Qt version, select it in the list and select \gui Details in the \gui {Qt version for} section. To add Qt versions, select \gui {Tools > Options > Build & Run > Qt Versions}. diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index d1e59b2eb8..534bec7690 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-building-targets.html \page creator-running-targets.html \nextpage creator-deployment.html diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 37061695c9..67fc627391 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-debuggers.html \page creator-build-settings.html \nextpage creator-run-settings.html diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-projects-settings-code-style.qdoc index 9f2a266c97..379df033b6 100644 --- a/doc/src/projects/creator-projects-settings-code-style.qdoc +++ b/doc/src/projects/creator-projects-settings-code-style.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-editor-settings.html \page creator-code-style-settings.html \nextpage creator-build-dependencies.html diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc index 8d3c19e391..d0f2b410e6 100644 --- a/doc/src/projects/creator-projects-settings-dependencies.qdoc +++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-code-style-settings.html \page creator-build-dependencies.html \nextpage creator-sharing-project-settings.html diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc index 9e4d2a7418..fad668df10 100644 --- a/doc/src/projects/creator-projects-settings-editor.qdoc +++ b/doc/src/projects/creator-projects-settings-editor.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-run-settings.html \page creator-editor-settings.html \nextpage creator-code-style-settings.html diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index f883910353..d91dcea4d7 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/doc/src/projects/creator-projects-settings-overview.qdoc @@ -23,16 +23,16 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-version-control.html \page creator-configuring-projects.html \nextpage creator-targets.html \title Configuring Projects - When you install an SDK for a target platform, such as Android or QNX, the - build and run settings for the development - targets delivered with the SDK might be set up automatically in \QC. + When you install Qt for a target platform, such as Android or QNX, the + build and run settings for the development targets might be set up + automatically in \QC. To view and modify the settings for currently open projects, switch to the \gui Projects mode by pressing \key Ctrl+5. diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index 1c6016a151..7ff6f03cdd 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-build-settings.html \page creator-run-settings.html \nextpage creator-editor-settings.html diff --git a/doc/src/projects/creator-projects-settings-sharing.qdoc b/doc/src/projects/creator-projects-settings-sharing.qdoc index 78d6a8d419..ba85e27e46 100644 --- a/doc/src/projects/creator-projects-settings-sharing.qdoc +++ b/doc/src/projects/creator-projects-settings-sharing.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-build-dependencies.html \page creator-sharing-project-settings.html \nextpage creator-project-managing-sessions.html diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index b7ea7cfeb8..03f8b121a7 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-configuring-projects.html \page creator-targets.html \nextpage creator-project-qmake.html diff --git a/doc/src/qnx/creator-deployment-bb10.qdoc b/doc/src/qnx/creator-deployment-bb10.qdoc index 527729876c..f2ec258608 100644 --- a/doc/src/qnx/creator-deployment-bb10.qdoc +++ b/doc/src/qnx/creator-deployment-bb10.qdoc @@ -25,7 +25,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-deploying-android.html \page creator-deployment-bb10.html \nextpage creator-deployment-maemo.html diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc index 4d39165125..1c94d4ee4e 100644 --- a/doc/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/src/qnx/creator-deployment-qnx.qdoc @@ -25,7 +25,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-deployment-maemo.html \page creator-deployment-qnx.html \nextpage creator-connecting-mobile.html diff --git a/doc/src/qnx/creator-developing-bb10.qdoc b/doc/src/qnx/creator-developing-bb10.qdoc index 6d90b2169d..4a4a5975b3 100644 --- a/doc/src/qnx/creator-developing-bb10.qdoc +++ b/doc/src/qnx/creator-developing-bb10.qdoc @@ -19,7 +19,7 @@ ****************************************************************************/ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-baremetal.html \page creator-developing-bb10.html \nextpage creator-developing-generic-linux.html diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc index b05c929e00..a44dd6d93b 100644 --- a/doc/src/qnx/creator-developing-qnx.qdoc +++ b/doc/src/qnx/creator-developing-qnx.qdoc @@ -19,7 +19,7 @@ ****************************************************************************/ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-ios.html \page creator-developing-qnx.html \nextpage creator-developing-winrt.html diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 212ed1cfaf..307d22c29e 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-design-mode.html \page creator-visual-editor.html \nextpage quick-projects.html diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 936a1786a4..3675b9a8d3 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-tutorials.html \page creator-qml-application.html \nextpage creator-writing-program.html diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 617c60fb5c..3fc8a4d7ac 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-components.html \page quick-buttons.html \nextpage quick-scalable-image.html @@ -99,7 +99,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-buttons.html \page quick-scalable-image.html \nextpage quick-screens.html diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index bf6a598778..4980510261 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-using-qt-quick-designer.html \page quick-components.html \nextpage quick-buttons.html @@ -77,8 +77,8 @@ Since Qt 5.1, a set of Qt Quick Controls is available for creating classic desktop-style user interfaces using Qt Quick 2.1. - You can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt - Quick Controls as part of Qt 5.1, or later. + Qt Quick 1 Components are a part of Qt 4, whereas Qt Quick Controls were + added to Qt 5.1. The \QC project wizards create Qt Quick applications that use Qt Quick Components or Controls. diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index fc03315dbe..73cadde517 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-visual-editor.html \page quick-projects.html \nextpage creator-using-qt-quick-designer.html diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index e041148b3e..c6b22bb80a 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-projects.html \page creator-using-qt-quick-designer.html \nextpage quick-components.html diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc index 746bbc0770..e584be2d75 100644 --- a/doc/src/qtquick/qtquick-exporting-qml.qdoc +++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-screens.html \page quick-export-to-qml.html \nextpage creator-qml-modules-with-plugins.html diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc index 0ff4f1ffef..cc374bb065 100644 --- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-export-to-qml.html \page creator-qml-modules-with-plugins.html \nextpage creator-using-qt-designer.html diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index da940fd7ea..bdf655f7f8 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -24,7 +24,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage quick-scalable-image.html \page quick-screens.html \nextpage quick-export-to-qml.html @@ -41,9 +41,8 @@ You can also use ready-made Qt Quick 1 Components (for Qt 4) to create screens with a native look and feel for a particular target platform. Since Qt 5.1, a set of Qt Quick Controls is available for creating classic - desktop-style user interfaces using Qt Quick 2.1. You - can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt Quick - Controls as part of Qt 5.1, or later. + desktop-style user interfaces using Qt Quick 2.1. Qt Quick 1 Components are + a part of Qt 4, whereas Qt Quick Controls were added to Qt 5.1. \section1 Adding Components to Screens diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index 16fcf42296..74cb9eab6c 100644 --- a/doc/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/src/qtquick/qtquick-toolbars.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-indenting-code.html \page qt-quick-toolbars.html \nextpage creator-editor-codepasting.html diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc index 852efc9c9d..1ab5c66497 100644 --- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-qml-application.html \page creator-writing-program.html \nextpage creator-android-app-tutorial.html diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc index 4be1ded78d..989e65a1a3 100644 --- a/doc/src/widgets/qtdesigner-overview.qdoc +++ b/doc/src/widgets/qtdesigner-overview.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-qml-modules-with-plugins.html \page creator-using-qt-designer.html \nextpage adding-plugins.html diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc index 2c8eac05aa..0b18eaaeb3 100644 --- a/doc/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/src/widgets/qtdesigner-plugins.qdoc @@ -23,7 +23,7 @@ // ********************************************************************** /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-using-qt-designer.html \page adding-plugins.html \nextpage creator-usability.html @@ -47,8 +47,8 @@ \QD fetches plugins from the standard locations and loads the plugins that match its build key. \QD is delivered both as a standalone application - and as part of the SDK, where it is integrated into \QC. The correct folder - to place the plugins depends on which one you use. + and integrated into \QC. The correct folder to place the plugins depends on + whether you use the standalone \QD or the integrated \QD. The integrated \QD fetches plugins from the \c {%SDK%\bin\designer} folder on Windows and Linux. For information about how to configure plugins on @@ -128,7 +128,7 @@ \section1 Matching Build Keys - The \QC that is included in pre-built SDK packages on Windows is built with + The \QC that is included in pre-built Qt packages on Windows is built with the Microsoft Visual Studio compiler, whereas the version of Qt shipped for building applications is configured and built to use the MinGW/g++ compiler. Plugins built by using this version of Qt cannot be loaded by \QC because diff --git a/doc/src/winrt/creator-winrt.qdoc b/doc/src/winrt/creator-winrt.qdoc index 08b223ded6..ba6b744010 100644 --- a/doc/src/winrt/creator-winrt.qdoc +++ b/doc/src/winrt/creator-winrt.qdoc @@ -18,7 +18,7 @@ /*! - \contentspage index.html + \contentspage {Qt Creator Manual} \previouspage creator-developing-qnx.html \page creator-developing-winrt.html \nextpage creator-build-process-customizing.html |