diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 10:03:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 10:03:48 +0200 |
| commit | 6b8167c663f3e2b2b5b421f59045602e2e9bc633 (patch) | |
| tree | 8c8f4fffebb790867cd75121f888af49f986b33e /doc | |
| parent | bf4d9aed33f0b49cf8f6d4d5edd1915d70f326c3 (diff) | |
| parent | 53553165ba6a9d8dfbac6dab2e246d6a60221a7e (diff) | |
| download | qt-creator-6b8167c663f3e2b2b5b421f59045602e2e9bc633.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Diffstat (limited to 'doc')
96 files changed, 373 insertions, 279 deletions
diff --git a/doc/images/qml-toolbar-animation.png b/doc/images/qml-toolbar-animation.png Binary files differindex 6178fa58a2..28bb9a3a4f 100644 --- a/doc/images/qml-toolbar-animation.png +++ b/doc/images/qml-toolbar-animation.png diff --git a/doc/images/qml-toolbar-image-preview.png b/doc/images/qml-toolbar-image-preview.png Binary files differindex ffdc8bddfa..3f6e02d200 100644 --- a/doc/images/qml-toolbar-image-preview.png +++ b/doc/images/qml-toolbar-image-preview.png diff --git a/doc/images/qml-toolbar-image.png b/doc/images/qml-toolbar-image.png Binary files differindex e100e87c5b..43e79f5582 100644 --- a/doc/images/qml-toolbar-image.png +++ b/doc/images/qml-toolbar-image.png diff --git a/doc/images/qml-toolbar-pin.png b/doc/images/qml-toolbar-pin.png Binary files differindex b0bfcd0eca..8fce27b986 100644 --- a/doc/images/qml-toolbar-pin.png +++ b/doc/images/qml-toolbar-pin.png diff --git a/doc/images/qml-toolbar-rectangle.png b/doc/images/qml-toolbar-rectangle.png Binary files differindex a968677e7c..296fb79815 100644 --- a/doc/images/qml-toolbar-rectangle.png +++ b/doc/images/qml-toolbar-rectangle.png diff --git a/doc/images/qml-toolbar-text.png b/doc/images/qml-toolbar-text.png Binary files differindex 985a9fa204..3cbc055434 100644 --- a/doc/images/qml-toolbar-text.png +++ b/doc/images/qml-toolbar-text.png diff --git a/doc/images/qml-translate.png b/doc/images/qml-translate.png Binary files differindex 346be5fb0c..3b2228b7c8 100644 --- a/doc/images/qml-translate.png +++ b/doc/images/qml-translate.png diff --git a/doc/images/qmldesigner-borderimage.png b/doc/images/qmldesigner-borderimage.png Binary files differindex c28386bd47..d766161fb0 100644 --- a/doc/images/qmldesigner-borderimage.png +++ b/doc/images/qmldesigner-borderimage.png diff --git a/doc/images/qmldesigner-button.png b/doc/images/qmldesigner-button.png Binary files differindex 21556d56e9..faf511fb63 100644 --- a/doc/images/qmldesigner-button.png +++ b/doc/images/qmldesigner-button.png diff --git a/doc/images/qmldesigner-center-in.png b/doc/images/qmldesigner-center-in.png Binary files differindex 5d2213016e..979f9796b6 100644 --- a/doc/images/qmldesigner-center-in.png +++ b/doc/images/qmldesigner-center-in.png diff --git a/doc/images/qmldesigner-code-completion.png b/doc/images/qmldesigner-code-completion.png Binary files differindex e925a8722e..f374766e05 100644 --- a/doc/images/qmldesigner-code-completion.png +++ b/doc/images/qmldesigner-code-completion.png diff --git a/doc/images/qmldesigner-screen-design.png b/doc/images/qmldesigner-screen-design.png Binary files differindex e72e49f8cb..fc18f060bd 100644 --- a/doc/images/qmldesigner-screen-design.png +++ b/doc/images/qmldesigner-screen-design.png diff --git a/doc/images/qmldesigner-states.png b/doc/images/qmldesigner-states.png Binary files differindex 1cbd979b16..7d96ea42be 100644 --- a/doc/images/qmldesigner-states.png +++ b/doc/images/qmldesigner-states.png diff --git a/doc/images/qtcreator-add-online-doc.png b/doc/images/qtcreator-add-online-doc.png Binary files differindex 1c52c07aa9..ca9e148b42 100644 --- a/doc/images/qtcreator-add-online-doc.png +++ b/doc/images/qtcreator-add-online-doc.png diff --git a/doc/images/qtcreator-analyzer-settings.png b/doc/images/qtcreator-analyzer-settings.png Binary files differindex ee308a9ca5..f9a587947c 100644 --- a/doc/images/qtcreator-analyzer-settings.png +++ b/doc/images/qtcreator-analyzer-settings.png diff --git a/doc/images/qtcreator-back.png b/doc/images/qtcreator-back.png Binary files differindex 4d75f51a36..7d936d0515 100644 --- a/doc/images/qtcreator-back.png +++ b/doc/images/qtcreator-back.png diff --git a/doc/images/qtcreator-blockhighlighting.png b/doc/images/qtcreator-blockhighlighting.png Binary files differindex a4d73173f9..63a5cbc524 100644 --- a/doc/images/qtcreator-blockhighlighting.png +++ b/doc/images/qtcreator-blockhighlighting.png diff --git a/doc/images/qtcreator-clear.png b/doc/images/qtcreator-clear.png Binary files differindex 1fa6546ecd..f60be050c5 100644 --- a/doc/images/qtcreator-clear.png +++ b/doc/images/qtcreator-clear.png diff --git a/doc/images/qtcreator-code-style-alignment.png b/doc/images/qtcreator-code-style-alignment.png Binary files differindex 1a07f30a11..2f60c10fe7 100644 --- a/doc/images/qtcreator-code-style-alignment.png +++ b/doc/images/qtcreator-code-style-alignment.png diff --git a/doc/images/qtcreator-code-style-braces.png b/doc/images/qtcreator-code-style-braces.png Binary files differindex 1d7a1fc19d..f2d9cf19e0 100644 --- a/doc/images/qtcreator-code-style-braces.png +++ b/doc/images/qtcreator-code-style-braces.png diff --git a/doc/images/qtcreator-code-style-content.png b/doc/images/qtcreator-code-style-content.png Binary files differindex 406bb56b4c..6fd1089613 100644 --- a/doc/images/qtcreator-code-style-content.png +++ b/doc/images/qtcreator-code-style-content.png diff --git a/doc/images/qtcreator-code-style-switch.png b/doc/images/qtcreator-code-style-switch.png Binary files differindex f1bee850d3..5038c4f446 100644 --- a/doc/images/qtcreator-code-style-switch.png +++ b/doc/images/qtcreator-code-style-switch.png diff --git a/doc/images/qtcreator-codecompletion.png b/doc/images/qtcreator-codecompletion.png Binary files differindex be66651a5a..1d3b5600a9 100644 --- a/doc/images/qtcreator-codecompletion.png +++ b/doc/images/qtcreator-codecompletion.png diff --git a/doc/images/qtcreator-edit-code-snippets.png b/doc/images/qtcreator-edit-code-snippets.png Binary files differindex 4a77cc04f0..91e50ce5ba 100644 --- a/doc/images/qtcreator-edit-code-snippets.png +++ b/doc/images/qtcreator-edit-code-snippets.png diff --git a/doc/images/qtcreator-editor-casesensitive.png b/doc/images/qtcreator-editor-casesensitive.png Binary files differdeleted file mode 100644 index 82254cf49f..0000000000 --- a/doc/images/qtcreator-editor-casesensitive.png +++ /dev/null diff --git a/doc/images/qtcreator-editor-regularexpressions.png b/doc/images/qtcreator-editor-regularexpressions.png Binary files differdeleted file mode 100644 index ed8ae9c89a..0000000000 --- a/doc/images/qtcreator-editor-regularexpressions.png +++ /dev/null diff --git a/doc/images/qtcreator-editor-wholewords.png b/doc/images/qtcreator-editor-wholewords.png Binary files differdeleted file mode 100644 index 6c07406dbc..0000000000 --- a/doc/images/qtcreator-editor-wholewords.png +++ /dev/null diff --git a/doc/images/qtcreator-editortoolbar-symbols.png b/doc/images/qtcreator-editortoolbar-symbols.png Binary files differindex d966a8daed..7386697de3 100644 --- a/doc/images/qtcreator-editortoolbar-symbols.png +++ b/doc/images/qtcreator-editortoolbar-symbols.png diff --git a/doc/images/qtcreator-embedded-linux-deployment.png b/doc/images/qtcreator-embedded-linux-deployment.png Binary files differnew file mode 100644 index 0000000000..eb015b9f03 --- /dev/null +++ b/doc/images/qtcreator-embedded-linux-deployment.png diff --git a/doc/images/qtcreator-expand.png b/doc/images/qtcreator-expand.png Binary files differindex 9841e6b42a..3ee9bfe8e0 100644 --- a/doc/images/qtcreator-expand.png +++ b/doc/images/qtcreator-expand.png diff --git a/doc/images/qtcreator-fakevim-options.png b/doc/images/qtcreator-fakevim-options.png Binary files differnew file mode 100644 index 0000000000..5bcf99c10f --- /dev/null +++ b/doc/images/qtcreator-fakevim-options.png diff --git a/doc/images/qtcreator-font-colors.png b/doc/images/qtcreator-font-colors.png Binary files differindex 1df5031313..b4bcafcbd7 100644 --- a/doc/images/qtcreator-font-colors.png +++ b/doc/images/qtcreator-font-colors.png diff --git a/doc/images/qtcreator-formedit.png b/doc/images/qtcreator-formedit.png Binary files differindex ac95222093..4ac5720b64 100644 --- a/doc/images/qtcreator-formedit.png +++ b/doc/images/qtcreator-formedit.png diff --git a/doc/images/qtcreator-forward.png b/doc/images/qtcreator-forward.png Binary files differindex 4f27cdba1f..da9a9e8e83 100644 --- a/doc/images/qtcreator-forward.png +++ b/doc/images/qtcreator-forward.png diff --git a/doc/images/qtcreator-generic-highlighter.png b/doc/images/qtcreator-generic-highlighter.png Binary files differindex c1cf8844b9..322d4efe62 100644 --- a/doc/images/qtcreator-generic-highlighter.png +++ b/doc/images/qtcreator-generic-highlighter.png diff --git a/doc/images/qtcreator-gs-build-example-targets.png b/doc/images/qtcreator-gs-build-example-targets.png Binary files differindex 9047b93d20..72437f6789 100644 --- a/doc/images/qtcreator-gs-build-example-targets.png +++ b/doc/images/qtcreator-gs-build-example-targets.png diff --git a/doc/images/qtcreator-indentation.png b/doc/images/qtcreator-indentation.png Binary files differindex 65721093c6..3eaca819da 100644 --- a/doc/images/qtcreator-indentation.png +++ b/doc/images/qtcreator-indentation.png diff --git a/doc/images/qtcreator-linux-device-configurations.png b/doc/images/qtcreator-linux-device-configurations.png Binary files differindex ee271eb944..23f284726e 100644 --- a/doc/images/qtcreator-linux-device-configurations.png +++ b/doc/images/qtcreator-linux-device-configurations.png diff --git a/doc/images/qtcreator-locator-customize.png b/doc/images/qtcreator-locator-customize.png Binary files differindex 51f575b2ff..01aaab0a76 100644 --- a/doc/images/qtcreator-locator-customize.png +++ b/doc/images/qtcreator-locator-customize.png diff --git a/doc/images/qtcreator-locator-magnify.png b/doc/images/qtcreator-locator-magnify.png Binary files differindex 62c2f44972..746ff20be2 100644 --- a/doc/images/qtcreator-locator-magnify.png +++ b/doc/images/qtcreator-locator-magnify.png diff --git a/doc/images/qtcreator-locator-open.png b/doc/images/qtcreator-locator-open.png Binary files differindex 1c420cedf2..017bc31afa 100644 --- a/doc/images/qtcreator-locator-open.png +++ b/doc/images/qtcreator-locator-open.png diff --git a/doc/images/qtcreator-locator.png b/doc/images/qtcreator-locator.png Binary files differindex 8ad4d9319e..ae3b1f2b2e 100644 --- a/doc/images/qtcreator-locator.png +++ b/doc/images/qtcreator-locator.png diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png Binary files differindex 3e6c084b09..7a8b6071e0 100644 --- a/doc/images/qtcreator-maemo-deb-package.png +++ b/doc/images/qtcreator-maemo-deb-package.png diff --git a/doc/images/qtcreator-maemo-deployment.png b/doc/images/qtcreator-maemo-deployment.png Binary files differindex 9987311632..e1692df4e6 100644 --- a/doc/images/qtcreator-maemo-deployment.png +++ b/doc/images/qtcreator-maemo-deployment.png diff --git a/doc/images/qtcreator-manage-definitions.png b/doc/images/qtcreator-manage-definitions.png Binary files differindex 5c8e25d7f8..9778e28d63 100644 --- a/doc/images/qtcreator-manage-definitions.png +++ b/doc/images/qtcreator-manage-definitions.png diff --git a/doc/images/qtcreator-mime-types-magic-header.png b/doc/images/qtcreator-mime-types-magic-header.png Binary files differindex 3a35ffa504..f8736d030e 100644 --- a/doc/images/qtcreator-mime-types-magic-header.png +++ b/doc/images/qtcreator-mime-types-magic-header.png diff --git a/doc/images/qtcreator-mime-types.png b/doc/images/qtcreator-mime-types.png Binary files differindex a8982e7a54..5d53b80898 100644 --- a/doc/images/qtcreator-mime-types.png +++ b/doc/images/qtcreator-mime-types.png diff --git a/doc/images/qtcreator-navigate-customfilter.png b/doc/images/qtcreator-navigate-customfilter.png Binary files differindex 2d8c30e151..bf8943d445 100644 --- a/doc/images/qtcreator-navigate-customfilter.png +++ b/doc/images/qtcreator-navigate-customfilter.png diff --git a/doc/images/qtcreator-navigate-popup.png b/doc/images/qtcreator-navigate-popup.png Binary files differindex f1e5c39ea7..7cb42aef87 100644 --- a/doc/images/qtcreator-navigate-popup.png +++ b/doc/images/qtcreator-navigate-popup.png diff --git a/doc/images/qtcreator-next.png b/doc/images/qtcreator-next.png Binary files differindex cbbb47a9b8..70d1a02311 100644 --- a/doc/images/qtcreator-next.png +++ b/doc/images/qtcreator-next.png diff --git a/doc/images/qtcreator-open-project-targets.png b/doc/images/qtcreator-open-project-targets.png Binary files differindex 524e8187c0..524bb566e8 100644 --- a/doc/images/qtcreator-open-project-targets.png +++ b/doc/images/qtcreator-open-project-targets.png diff --git a/doc/images/qtcreator-options-code-style-cpp.png b/doc/images/qtcreator-options-code-style-cpp.png Binary files differindex e1a4e5c802..ba54d09e49 100644 --- a/doc/images/qtcreator-options-code-style-cpp.png +++ b/doc/images/qtcreator-options-code-style-cpp.png diff --git a/doc/images/qtcreator-options-code-style-qml.png b/doc/images/qtcreator-options-code-style-qml.png Binary files differindex f633b1b6f9..538155eb7b 100644 --- a/doc/images/qtcreator-options-code-style-qml.png +++ b/doc/images/qtcreator-options-code-style-qml.png diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/images/qtcreator-pprunsettings.png Binary files differindex fe79cfadf1..35528c761a 100644 --- a/doc/images/qtcreator-pprunsettings.png +++ b/doc/images/qtcreator-pprunsettings.png diff --git a/doc/images/qtcreator-previous.png b/doc/images/qtcreator-previous.png Binary files differindex 24f4c4934b..8d67ed89ff 100644 --- a/doc/images/qtcreator-previous.png +++ b/doc/images/qtcreator-previous.png diff --git a/doc/images/qtcreator-qt4-symbian-device-connected.png b/doc/images/qtcreator-qt4-symbian-device-connected.png Binary files differindex 56cecc7866..5d570517cc 100644 --- a/doc/images/qtcreator-qt4-symbian-device-connected.png +++ b/doc/images/qtcreator-qt4-symbian-device-connected.png diff --git a/doc/images/qtcreator-qt4-symbian-signing.png b/doc/images/qtcreator-qt4-symbian-signing.png Binary files differindex f5a3394b62..e43cd4deea 100644 --- a/doc/images/qtcreator-qt4-symbian-signing.png +++ b/doc/images/qtcreator-qt4-symbian-signing.png diff --git a/doc/images/qtcreator-refactoring-find.png b/doc/images/qtcreator-refactoring-find.png Binary files differindex 271b61c239..288b51a030 100644 --- a/doc/images/qtcreator-refactoring-find.png +++ b/doc/images/qtcreator-refactoring-find.png diff --git a/doc/images/qtcreator-refactoring-replace.png b/doc/images/qtcreator-refactoring-replace.png Binary files differindex 49d28a1b42..8cf98e94d1 100644 --- a/doc/images/qtcreator-refactoring-replace.png +++ b/doc/images/qtcreator-refactoring-replace.png diff --git a/doc/images/qtcreator-remove-deploy-step.png b/doc/images/qtcreator-remove-deploy-step.png Binary files differindex 5bd6fa8e12..efe30a4f8c 100644 --- a/doc/images/qtcreator-remove-deploy-step.png +++ b/doc/images/qtcreator-remove-deploy-step.png diff --git a/doc/images/qtcreator-remove-split-button.png b/doc/images/qtcreator-remove-split-button.png Binary files differnew file mode 100644 index 0000000000..434e31cb06 --- /dev/null +++ b/doc/images/qtcreator-remove-split-button.png diff --git a/doc/images/qtcreator-run-settings-create.png b/doc/images/qtcreator-run-settings-create.png Binary files differindex 3328eabf6d..61cdfbac6b 100644 --- a/doc/images/qtcreator-run-settings-create.png +++ b/doc/images/qtcreator-run-settings-create.png diff --git a/doc/images/qtcreator-run-settings-linux-devices.png b/doc/images/qtcreator-run-settings-linux-devices.png Binary files differindex 939c3e081e..533b51fa76 100644 --- a/doc/images/qtcreator-run-settings-linux-devices.png +++ b/doc/images/qtcreator-run-settings-linux-devices.png diff --git a/doc/images/qtcreator-screenshot-devconf-linux.png b/doc/images/qtcreator-screenshot-devconf-linux.png Binary files differindex 97ca9d6f00..cb69dca7b3 100644 --- a/doc/images/qtcreator-screenshot-devconf-linux.png +++ b/doc/images/qtcreator-screenshot-devconf-linux.png diff --git a/doc/images/qtcreator-screenshot-run-settings-maemo.png b/doc/images/qtcreator-screenshot-run-settings-maemo.png Binary files differindex 8fe3559da2..f95153d676 100644 --- a/doc/images/qtcreator-screenshot-run-settings-maemo.png +++ b/doc/images/qtcreator-screenshot-run-settings-maemo.png diff --git a/doc/images/qtcreator-search-allprojects.png b/doc/images/qtcreator-search-allprojects.png Binary files differindex e74dac67ce..8cecbf686e 100644 --- a/doc/images/qtcreator-search-allprojects.png +++ b/doc/images/qtcreator-search-allprojects.png diff --git a/doc/images/qtcreator-search-cpp-symbols.png b/doc/images/qtcreator-search-cpp-symbols.png Binary files differindex 57838cf9e8..706ec20ade 100644 --- a/doc/images/qtcreator-search-cpp-symbols.png +++ b/doc/images/qtcreator-search-cpp-symbols.png diff --git a/doc/images/qtcreator-searchresults.png b/doc/images/qtcreator-searchresults.png Binary files differindex b59fa60bd0..0b9c06cae8 100644 --- a/doc/images/qtcreator-searchresults.png +++ b/doc/images/qtcreator-searchresults.png diff --git a/doc/images/qtcreator-semanticerror.png b/doc/images/qtcreator-semanticerror.png Binary files differindex 1d8bb335d0..e6920b98ca 100644 --- a/doc/images/qtcreator-semanticerror.png +++ b/doc/images/qtcreator-semanticerror.png diff --git a/doc/images/qtcreator-split-button.png b/doc/images/qtcreator-split-button.png Binary files differnew file mode 100644 index 0000000000..8ab798c6ed --- /dev/null +++ b/doc/images/qtcreator-split-button.png diff --git a/doc/images/qtcreator-spliteditorview.png b/doc/images/qtcreator-spliteditorview.png Binary files differindex 86a5f8db93..e7d99593e5 100644 --- a/doc/images/qtcreator-spliteditorview.png +++ b/doc/images/qtcreator-spliteditorview.png diff --git a/doc/images/qtcreator-symbian-run-settings.png b/doc/images/qtcreator-symbian-run-settings.png Binary files differindex 90bd00b233..3daefc707a 100644 --- a/doc/images/qtcreator-symbian-run-settings.png +++ b/doc/images/qtcreator-symbian-run-settings.png diff --git a/doc/images/qtcreator-syntaxerror.png b/doc/images/qtcreator-syntaxerror.png Binary files differindex f7ec9c6b20..2f8916ce3b 100644 --- a/doc/images/qtcreator-syntaxerror.png +++ b/doc/images/qtcreator-syntaxerror.png diff --git a/doc/images/qtcreator-target-selector.png b/doc/images/qtcreator-target-selector.png Binary files differindex 5035cfc2ac..62ac377e9b 100644 --- a/doc/images/qtcreator-target-selector.png +++ b/doc/images/qtcreator-target-selector.png diff --git a/doc/images/qtcreator-togglebookmark.png b/doc/images/qtcreator-togglebookmark.png Binary files differindex d643df87b1..87cd120bab 100644 --- a/doc/images/qtcreator-togglebookmark.png +++ b/doc/images/qtcreator-togglebookmark.png diff --git a/doc/snippets/qml/quick-scalable-image.qml b/doc/snippets/qml/quick-scalable-image.qml index fe82b298f4..e469173876 100644 --- a/doc/snippets/qml/quick-scalable-image.qml +++ b/doc/snippets/qml/quick-scalable-image.qml @@ -1,8 +1,12 @@ Item { //! [properties and signal definitions] property string text: "" - property int fontSize: 44 + property int fontSize: 10 signal clicked + + width: 60 + height: 40 + //! [properties and signal definitions] } diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index f2e36d1ae3..7e89228dbd 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -39,38 +39,24 @@ \list - \o \l{Debugging a C++ Example Application} - - Illustrates how to debug Qt C++ applications in the \gui Debug - mode. - - \o \l{Debugging a Qt Quick Example Application} + \o \l{Setting Up Debugger} - Illustrates how to debug Qt Quick applications in the \gui Debug - mode. + The debugger plugin automatically selects a suitable + native debugger for your projects from the ones found + on your system. Manual overriding of this choice is possible. \o \l{Launching the Debugger} - To start a program under the control of the debugger, press - \key{F5}. \QC checks whether the compiled program is up-to-date, - and rebuilds it if necessary. The debugger then takes over and - starts the program. The debugger is launched in the appropriate - operating mode (plain, terminal, or on-device), based on the - build and run settings for the active project. You can also launch - the debugger in other mode. + To start an application from an open project under the control + of a debugger, press the Debug button in the lower left corner + of the main view, or press \key{F5}. Other, less common start + options are available in the \gui{Debug} > \gui{Start Debugging} + menu. \o \l{Interacting with the Debugger} - You can use the \QC \gui Debug mode to inspect the state of your - application while debugging. - - \o \l{Setting Up Debugger} - - The debugger plugin tries to automatically pick up a suitable - native debugger. You only need to set it up if the automatic setup - fails, because the native debugger is missing (as is usually the - case for the CDB debugger on Windows, which you always must install - yourself) or because the installed version is not supported. + You can use the tool views in the \gui Debug mode to inspect the + state of your application while debugging. \o \l{Using Debugging Helpers} @@ -78,12 +64,13 @@ user-extensible manner. For this purpose, it takes advantage of two technologies, collectively referred to as \e {debugging helpers}. Using the debugging helpers is not essential for - debugging with \QC, but they help you to quickly examine complex - data. + debugging with \QC, but they provide you with a powerful + tool to quickly examine complex data. \o \l{Debugging Qt Quick Projects} - In the \gui Debug mode, you can inspect the state of the + When debugging a Qt Quick application, you can inspect the state + of the application while debugging JavaScript functions. You can set breakpoints, view call stack trace, and examine locals and expressions. When the application is interrupted by a breakpoint, @@ -94,6 +81,14 @@ view to explore the object structure, debug animations, and inspect colors. + \o \l{Debugging a C++ Example Application} + + Illustrates how to debug C++ applications in \QC. + + \o \l{Debugging a Qt Quick Example Application} + + Illustrates how to debug Qt Quick applications in \QC. + \o \l{Troubleshooting Debugger} If you encounter problems while debugging, check for possible @@ -111,83 +106,129 @@ \title Launching the Debugger - To start a program under the control of the debugger, select \gui{Debug} > - \gui{Start Debugging} > \gui{Start Debugging}, or press \key{F5}. + To start an application from an open project under the control + of a debugger, press the \gui Debug button in the lower left corner + of the main view, or press \key{F5}. + \QC checks whether the compiled program is up-to-date, and rebuilds - it if necessary. The debugger then takes over and starts the program. + and deploys it if the \gui{Always build project before deploying it} and + \gui{Always deploy before running} options are selected in the + \gui{Build and Run} options. + + The debugger then takes over and starts the program with suitable + parameters. - \note Starting a program in the debugger can take a long + \note Starting a C++ program in the debugger can take a long time, typically in the range of several seconds to minutes if complex features (like QtWebKit) are used. - The debugger is launched in the appropriate operating mode (plain, terminal, - or on-device), based on the build and run settings for the active project. - Select \gui Debug menu options to launch the debugger in other modes. - - \note Debugging QML and JavaScript is supported only in plain mode. \section1 Launching the Debugger in Different Modes - The debugger plugin runs in different operating modes depending on where and - how the process is started and run. Some of the modes are only available for - a particular operating system or platform. + The debugger plugin can run the native debuggers in various operating + modes depending on where and how the process is started and run. Some + of the modes are only available for a particular operating system or + platform. + + In general, the \key{F5} and the \gui{Debug} button are set up in a way + to start operating mode that is commonly used the a given context. + So if the current project is set up as a C++ application using + the MinGW toolchain targeting desktop Windows, the GDB engine will + be started in Start Local mode. If the current project is a + QML application using C++ plugins targeting Meego + a "mixed" QML/C++ engine will be started, with the C++ parts + being handled by GDB and GDB server remote debugging. + + To select other modes of operation, change the run run configuration + parameters (such as \gui{Run in Terminal}) in the run settings of the + project, or select options from the \gui{Debug} > \gui{Start Debugging} + menu. - You can launch the debugger in the following modes: + The debugger can run in the following modes: \list - \o \bold Plain to debug locally started applications, such as a + \o \bold{Start Local} to debug locally started applications, such as a Qt based GUI application. - \o \bold Terminal to debug locally started processes that need a + \o \bold{Terminal} to debug locally started processes that need a console, typically without a GUI. - \o \bold Attach to debug local processes started outside \QC. + \o \bold{Attach Local} to debug local processes started outside \QC. - \o \bold Remote to debug a process running on a different machine. + \o \bold{Start Remote} to start and debug processes running + on a different machine. - \o \bold Core to debug crashed processes on Unix. + \o \bold{Attach Remote} to attach to a process running on a different + machine. - \o \bold Post-mortem to debug crashed processes on Windows. + \o \bold{Core} to debug crashed processes on Unix. - \o \bold On-device to debug processes running on a mobile device. + \o \bold{Post-mortem} to debug crashed processes on Windows. \endlist - \note Debugging QML and JavaScript is supported only in plain mode. + \section2 Launching in Start Local Mode - \section2 Launching in Plain Mode + Start Local mode is the default start mode for most projects, including + all projects using a desktop Qt version and plain C++ projects. + + To launch the debugger in Start Local mode, click the + \gui {Start Debugging} button for the active project. + + To lauch Start Local mode to run any executable already present in the + system without using a project, select \gui{Debug > Start Debugging + > Start and Debug External Application}. - To launch the debugger in the plain mode, click the \gui {Start Debugging} - button for the active project, or choose - \gui {Debug > Start Debugging > Start and Debug External Application} - and specify an executable. \section2 Launching in Terminal Mode - To launch the debugger in the terminal mode, select \gui {Projects > Run - Settings} and select the \gui {Run in terminal} check box. Then click the - \gui {Start Debugging} button for the active project. + Terminal mode is a variation of Start Local and creates an additional + console window to enable user-terminal interaction. This is mainly + useful for non-GUI applications using the stdin and stdout channels + for communication. To launch the debugger in the terminal mode, + go to \gui {Projects > Run + Settings} and select the \gui {Run in terminal} check box. + Then click the \gui {Start Debugging} button for the active project. - \section2 Launching in Attach Mode + \section2 Launching in Attach Local Mode - To launch the debugger in the attach mode, select - \gui {Debug > Start Debugging > Attach to Running External Application}, + To attach the debugger to an already running process, select + \gui {Debug > Start Debugging > Attach to Running Local Application}, and then select a process by its name or process ID to attach to. - You can load the source project in advance and set breakpoints in it before - attaching to an already running process. For more information, see - \l{Setting Breakpoints}. + While this mode does not strictly require a project to be opened in \QC, + it is beneficial to have open one, as it makes setting breakpoints + and stepping throught the code easier. + + For more information, see \l{Setting Breakpoints}. + + \section2 Launching Remote Modes - \section2 Launching in Remote Mode + The Remote modes allow you to debug processes that run on remote + machines. - The remote mode allows you to debug processes that run on remote machines. + In general, the setup consist of a probe running on the remote + machine and a counterpart running on the host side. + The probe is either integrated into the running process (e.g. for QML + debugging) or runs a separate process (e.g. when using GDB server + on embedded Linux, or TRK/CODA on Symbian). The host side typically + consists of \QC itself, often with help of external process such + as CDB or GDB. + + While this setup might look daunting, it is mostly invisible to + the user. With a properly loaded and configured project, pressing + \key{F5} starts up all necessary helper processes and debugging on + the selected target. + + Special use cases, such as attaching to a running process on the + target, might still require manual setup. \section3 Using GDB - In remote mode, the local GDB process talks to a GDB server - process running on the remote machine that controls the process to be - debugged. + When debugging on a target supported by GDB server, a local GDB process + talks to a GDB server running on the remote machine that controls the + process to be debugged. The GDB server process is started on the remote machines by passing a port number and the executable: @@ -206,8 +247,8 @@ \list 1 - \o Select \gui {Debug > Start Debugging > Start and Attach to Remote - Application}. + \o Select \gui {Debug > Start Debugging > Attach to Remote + Debug Server}. \o In the \gui {Host and port} field, enter the name of the remote machine and the port number to use. @@ -284,8 +325,9 @@ \section2 Launching in Core Mode - The core mode it used to debug \e {core} files (crash dumps) that are - generated from crashed processes if the system is set up to allow this. + The Core mode is used to inspect \e {core} files (crash dumps) that are + generated from crashed processes on Linux and Unix systems if the system + is set up to allow this. To enable the dumping of core files on a Unix system enter the following command in the shell from which the application will be launched: @@ -294,8 +336,12 @@ ulimit -c unlimited \endcode - To launch the debugger in the core mode, select \gui{Debug > Start Debugging - > Attach to Core}. + To launch the debugger in the core mode, select \gui{Debug > Start + Debugging > Attach to Core}. + + Also in this mode, using a properly configured project containing + the sources of the crashed program is not strictly necessary, but + helpful. \section2 Launching in Post-Mortem Mode @@ -311,17 +357,6 @@ crashes on Windows. Click the \gui {Debug in \QC} button in the error message that is displayed by the Windows operating system. - \section2 Launching in On-device Mode - - The on-device mode is a special mode available for run configurations - targeting mobile devices. It debugs processes running on mobile - devices using on-device debugging agents, such as CODA on Symbian and - gdbserver on Linux-based devices. - - To launch the debugger in the on-device mode, open the project, select a - run configuration that targets a mobile device, and click the - \gui {Start Debugging} button. - */ @@ -333,39 +368,78 @@ \title Setting Up Debugger - \note The information in this section applies only to debugging the C++ - language. + The main debugger settings are associated with the tool chains used + to build your project. - Typically, the interaction between \QC and the native debugger is set up - automatically and you do not need to do anything. However, you might have an - unsupported GDB version installed, your Linux environment might not have GDB - installed at all, or you might want to use the debugging tools for Windows. + To configure tool chains, select \gui{Tools > Options > Build and Run > + Tool Chains}. The view lists the tool chains that \QC detected automatically. + You can add tool chains. - \note To use the debugging tools for Windows, you must install them and add - the Symbol Server provided by Microsoft to the symbol search path of the - debugger. For more information, see \l{Setting the Symbol Server in Windows}. + You need to set up the debugger only if the automatic setup + fails, because the native debugger is missing (as is usually the + case for the CDB debugger on Windows, which you always must install + yourself) or because the installed version is not supported (e.g. + when your system contains no, or an outdated version of GDB and you + want to use a locally installed replacement instead). - \note To use the Free Software Foundation (FSF) GDB on Mac OS, you must - sign it and add it to \QC as a tool chain. + \note If you need to change parameters of an automatically detected + toolchain, you can \gui{Clone} the tool chain and change the + parameters in the clone. Make sure to select the cloned tool chain + in the build settings of your project. - This section explains the options you have for debugging C++ code and - provides installation notes for the supported native debuggers. + \note To use the debugging tools for Windows, you must install them + and add the Symbol Server provided by Microsoft to the symbol search + path of the debugger. For more information, see \l{Setting the Symbol + Server in Windows}. - \section1 Supported Native Debugger Versions + \note To use the Free Software Foundation (FSF) version of GDB on + Mac OS, you must sign it and modify your tool chain settings. - The debugger plugin supports different builds of the GDB debugger, both - with and without the ability to use Python scripting. Use a Python enabled - version if one is available. - On Windows, Symbian, Maemo, and MeeGo Harmattan, only the Python version is - supported. - The non-Python versions use the compiled version of the debugging helpers, - that you must enable separately. For more information, see + This section explains the options you have for debugging C++ code + and provides installation notes for the supported native debuggers. + It also applies for code in other compiled languages such as C, + FORTRAN, Ada. + + \section1 Supported Native Debugger Versions + + Qt Creator supports essentially two native debuggers when working with + compiled code. On most supported platforms, the GNU Symbolic Debugger + GDB can be used. On Microsoft Windows, when using the Microsoft tool chain + the Microsoft Console Debugger CDB, is needed. There is also an + incomplete experimental interface to LLDB on Mac OS and Linux available + when building \QC from source. + + \section2 Supported GDB Versions + + GDB comes in two varieties with common roots. One is used on + Mac OS X and does not support Python as scripting language; the + other one is the version maintained by the Free Software Foundation + that can use Python as scripting language since version 7.0 + + The Python enabled versions are very convenient to interface, + and much of \QC's advanced data display options depend on the + availability of Python scripting. Since Python enabled versions + of GDB are bundled with all recent Linux versions, active + support for non-Python builds has been dropped for platforms + other than Mac OS X. + + The non-Python versions use the compiled version of the debugging + helpers, that you must enable separately. For more information, see \l{Debugging Helpers Based on C++}. The Python version uses a script version of the debugging helpers that does not need any special setup. + FSF GDB can also be compiled for Mac OS, but the build is currently + unstable, and thererefore, this is not recommended. + + The minimal supported version is 7.2. Using GDB version 7.4 + is highly recommended with \QC 2.5. For \QC 2.6 the minimal + supported version will be raised to GDB 7.4. + + \section2 Supported CDB Versions + The CDB native debugger has similar funtionality to the non-Python GDB debugger engine. Specifically, it also uses compiled C++ code for the debugging helper library. @@ -377,62 +451,34 @@ \o Platform \o Compiler \o Native Debugger - \o Python - \o Debugger Modes \row \o Linux - \o GCC + \o GCC, ICC \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core \row \o Unix - \o GCC - \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core - \row - \o Mac OS/GDB - \o GCC + \o GCC, ICC \o GDB - \o No - \o Plain, Terminal, Attach, Core \row - \o Mac OS/FSF GDB (experimental) + \o Mac OS X \o GCC - \o FSF GDB - \o Yes - \o Plain, Terminal, Attach, Core + \o Apple GDB, FSF GDB (experimental) \row \o Windows/MinGW \o GCC \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core \row \o Windows/MSVC \o Microsoft Visual C++ Compiler \o Debugging Tools for Windows/CDB - \o Not applicable - \o Plain, Terminal, Attach, Post-Mortem \row \o Symbian \o GCC \o GDB - \o Yes - \o On-device - \row - \o Maemo - \o GCC - \o GDB - \o Yes - \o On-device \row - \o MeeGo Harmattan + \o Maemo, MeeGo \o GCC \o GDB - \o Yes - \o On-device \endtable For more information on the debugger modes, see @@ -462,7 +508,7 @@ \o CoreGdbAdapter debugs core files generated from crashes. - \o RemoteGdbAdapter interacts with the gdbserver running on Linux. + \o RemoteGdbAdapter interacts with the GDB server running on Linux. \o CodaGdbAdapter interacts with Symbian devices. The GDB protocol and the GDB serial protocol are used between GDB and the adapter. The @@ -667,14 +713,15 @@ \o Examine the contents of the call stack. - \o Examine and modify registers and memory contents of - the debugged program. + \o Examine and modify contents of local and global variables. \o Examine and modify registers and memory contents of - local and global variables. + the debugged program. \o Examine the list of loaded shared libraries. + \o Disassemble sections of code. + \o Create snapshots of the current state of the debugged program and re-examine them later. diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 10ed5ef1e8..38d0984653 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -45,17 +45,17 @@ \image qtcreator-editortoolbar-symbols.png Use the toolbar to navigate between open files and symbols in use. - To browse forward or backward through your location history, click + To browse backward or forward through your location history, click \inlineimage qtcreator-back.png - and \inlineimage qtcreator-forward.png - . + (\gui {Go Back}) and \inlineimage qtcreator-forward.png + (\gui {Go Forward}). - To go to any open file, select it from the \gui{Open files} drop-down menu. + To go to any open file, select it from the \gui{Open files} drop-down menu (1). Right-click the menu title and select \gui {Copy Full Path to Clipboard} to copy the path and name of the current file to the clipboard. To jump to any symbol used in the current file, select it from the - \gui Symbols drop-down menu. By default, the symbols are displayed in the + \gui Symbols drop-down menu (2). By default, the symbols are displayed in the order in which they appear in the file. Right-click the menu title and select \gui {Sort Alphabetically} to arrange the symbols in alphabetic order. @@ -72,12 +72,15 @@ \list \o To split the editor view into a top and bottom view, select - \gui Window > \gui Split or press \key{Ctrl+E, 2}. + \gui Window > \gui Split, press \key{Ctrl+E, 2}, or select the + \inlineimage qtcreator-split-button.png + (\gui Split) button and then select \gui Split. Split command creates views below the currently active editor view. \o To split the editor view into adjacent views, select - \gui Window > \gui{Split Side by Side} or press \key{Ctrl+E, 3}. + \gui Window > \gui{Split Side by Side}, press \key{Ctrl+E, 3}, or + select \gui {Split > Split Side by Side}. Side by side split command creates views to the right of the currently active editor view. @@ -88,8 +91,11 @@ press \key{Ctrl+E, O}. To remove a split view, place the cursor within the view you want to - remove and select \gui Window > \gui{Remove Current Split} or press - \key{Ctrl+E, 0}. To remove all but the currently selected split view, + remove and select \gui Window > \gui{Remove Current Split}, press + \key{Ctrl+E, 0}, or select the + \inlineimage qtcreator-remove-split-button.png + (\gui {Remove Split}) button. To remove all but the currently selected split + view, select \gui Window > \gui{Remove All Splits} or press \key{Ctrl+E, 1}. \section1 Using Bookmarks diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 9ee0fb0b2a..ea67114e14 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -167,7 +167,7 @@ \o Semantic errors and warnings are underlined in olive. - In the following figure, the type is unknown. + In the following figure, the variable is not used. \image qtcreator-semanticerror.png @@ -783,13 +783,22 @@ \o \gui{Pastebin.Ca} + \o \gui{Paste.KDE.Org} + + \o \gui{Shared network drives} + \endlist To configure the server, select \gui{Tools} > \gui{Options} > - \gui{Code Pasting}. + \gui{Code Pasting}. In \gui CodePaster, specify the host name of the + CodePaster service. In \gui Fileshare, specify the path to a shared + network drive. The code snippets are copied to the drive as simple files. + You have to delete obsolete files from the drive manually. To paste a snippet of code onto the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Paste Snippet} or press \key{Alt+C,Alt+P}. + By default, \QC copies the URL of the snippet to the clipboard and displays + the URL in the \gui Output pane. To fetch a snippet of code from the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Fetch Snippet} or press \key{Alt+C,Alt+F}. @@ -862,14 +871,25 @@ \QC core, select \gui{Tools} > \gui{Options} > \gui{FakeVim} > \gui{Ex Command Mapping}. + To map \e {user commands} to keyboard shortcuts, select \gui{Tools > Options + > FakeVim > User Command Mapping}. The user command mapped to the shortcut + is executed by FakeVim as if you were typing it (as when replaying a macro). + To make changes to the Vim-style settings, select \gui{Tools} > \gui{Options} > \gui FakeVim > \gui{General}. + \image qtcreator-fakevim-options.png "FakeVim options" + + To preselect the indentation settings specified for the text editor, select + \gui {Copy Text Editor Settings}. To preselect the Qt coding style, select + \gui {Set Qt Style}. To preselect a simple indentation style, select + \gui {Set Plain Style}. You can then change any of the preselected settings. + To use a Vim-style color scheme, select \gui {Tools > Options > Text Editor > Fonts & Color}. In the \gui {Color Scheme} list, select \gui {Vim (dark)}. - To quit the FakeVim mode, unselect \gui{Tools} > \gui(Options} > + To quit the FakeVim mode, unselect \gui{Tools} > \gui{Options} > \gui{FakeVim} > \gui {Use FakeVim} or press \key{Alt+V,Alt+V}. You can temporarily escape FakeVim mode to access the normal \QC @@ -1108,9 +1128,10 @@ If the text is found, all occurrences are highlighted as you type. \o To go to the next occurrence, click \inlineimage qtcreator-next.png - , or press \key F3. To go to the previous occurrence click + (\gui {Find Next}), or press \key F3. To go to the previous + occurrence click \inlineimage qtcreator-previous.png - , or press \key Shift+F3. + (\gui {Find Previous}), or press \key Shift+F3. \endlist @@ -1120,16 +1141,13 @@ \list \o To make your search case sensitive, select - \inlineimage qtcreator-editor-casesensitive.png - . + \gui {Case Sensitive}. \o To search only whole words, select - \inlineimage qtcreator-editor-wholewords.png - . + \gui {Whole Words Only}. \o To search using regular expressions, select - \inlineimage qtcreator-editor-regularexpressions.png - . + \gui {Regular Expressions}. Regular expressions used in \QC are modeled on Perl regular expressions. For more information on using regular expressions, see \l {http://doc.qt.nokia.com/4.7/qregexp.html#details} @@ -1137,7 +1155,7 @@ \endlist - \note If you have selected text before selecting \gui Find/Replace, the + \note If you have selected text before selecting \gui {Find/Replace}, the search is conducted within the selection. To replace occurrences of the existing text, enter the new text in the @@ -1146,11 +1164,11 @@ \list \o To replace the selected occurrence and move to the next one, - click \inlineimage qtcreator-next.png + click \gui {Find Next} or press \key Ctrl+=. \o To replace the selected occurrence and move to the previous one, - click \inlineimage qtcreator-previous.png + click \gui {Find Previous} . \o To replace all occurrences in the file, click \gui{Replace All}. @@ -1204,11 +1222,14 @@ \o To go to an occurrence, double-click it. + \o To repeat the search after you have made changes to the + listed files, for example, select \gui {Search Again}. + \endlist \endlist - The search results are stored in the search history (1) from which you can + The search results are stored in the search history from which you can select earlier searches. \note You can use \gui{Advanced Find} also to search for symbols. For more @@ -1885,7 +1906,8 @@ \list 1 \o In the locator, click \inlineimage qtcreator-locator-magnify.png - and select \gui Configure to open the \gui Locator options. + (\gui {Options}) and select \gui Configure to open the \gui Locator + options. \o Select a filter, and then select \gui Edit. @@ -1939,8 +1961,8 @@ \list 1 - \o In the locator, click \inlineimage qtcreator-locator-magnify.png - and select \gui Configure to open the \gui Locator options. + \o In the locator, select \gui {Options > Configure} to open the + \gui Locator options. \image qtcreator-locator-customize.png @@ -1978,9 +2000,8 @@ all default filters is updated as you write your code. By default, \QC updates the filters created by you once an hour. - To update the cached information manually, click - \inlineimage qtcreator-locator-magnify.png - and select \gui Refresh. + To update the cached information manually, select \gui {Options > Refresh} + in the locator. To set a new cache update time: diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index ac1b9a82e5..7afb6758f2 100644 --- a/doc/src/editors/creator-finding.qdoc +++ b/doc/src/editors/creator-finding.qdoc @@ -40,8 +40,10 @@ The incremental search highlights the matching strings in the window while typing and the advanced search enables you to search from currently open projects or files on the file system. + You can conduct incremental and advanced searches in parallel. + In addition, you can search for symbols when you want to - refactor code. You can also search from the search results. + refactor code. \o \l{Searching with the Locator} diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index 9740fb2e09..81318b5b7b 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -31,15 +31,16 @@ \page creator-deployment-maemo.html \nextpage creator-connecting-mobile.html - \title Deploying Applications to Maemo or MeeGo Harmattan Devices + \title Deploying Applications to Linux-Based Devices - You can specify settings for deploying applications to Maemo 5 and MeeGo - Harmattan devices in the project .pro file. You can view the settings in the + You can specify settings for deploying applications to Linux-based devices + (Embedded Linux, MeeGo Harmattan, and Maemo 5) in the project .pro file. + You can view the settings in the \gui {Run Settings}. \image qtcreator-maemo-deployment.png "Deploy to device" - The files to be installed are listed in the \gui {Deploy to Device} step, + The files to be installed are listed in the \gui {Deployment} step, the \gui {Files to install for subproject} field. The \gui {Local File Path} field displays the location of the file on the development PC. The \gui {Remote Directory} field displays the folder where the file is @@ -48,6 +49,36 @@ \l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs} {INSTALLS variable} in the project .pro file to add the missing files. + When you run the application, \QC copies the necessary files to the device + and starts the application on it. + + \section1 Deploying on Embedded Linux + + \image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux" + + When you run the application on the \gui {Embedded Linux} target, \QC + deploys the application as specified by the deploy steps. By default, + \QC copies the application files to the device by using the SSH file + transfer protocol (SFTP), as specified by the \gui {Upload files via SFTP} + step. + + If you have a lot of data to copy, select \gui Details in the + \gui {Upload Files via SFTP} step, and then select the + \gui {Incremental deployment} check box. \QC takes note of the deployment + time and only copies files that have changed since the last deployment. + However, when you make major changes on the device, such as removing files + from the device manually or flashing a new disk image, or when you use + another device with the same IP address, deselect the check box once, to + have \QC deploy all files again. + + To only create a tarball and not copy the files to the device, select + \gui {Add Deploy Step > Create tarball}. Then remove all other deploy steps. + + The \gui {Deploy tarball via SFTP upload} step specifies that \QC + uploads the tarball to the device and extracts it. + + \section1 Deploying on MeeGo Harmattan and Maemo 5 + You can use desktop files to display icons on the home screen of the device. To add desktop files to the project file, select \gui {Add Desktop File}. To specify the icon file to display, select \gui {Add Launcher diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc index 64b7f0b704..ff35cae55e 100644 --- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc @@ -1,4 +1,4 @@ - \section1 Running on Generic Linux Devices + \section1 Running on Embedded Linux Devices \list 1 @@ -10,7 +10,7 @@ \list 1 \o Specify a connection to the device. For more information, see - \l{Connecting Generic Linux Devices}. + \l{Connecting Embedded Linux Devices}. \o Click the \gui Run button. @@ -21,15 +21,14 @@ \QC uses the compiler specified in the project build settings (tool chain) to build the application. - \QC generates an installation package, installs it on the - device, and executes the selected application. The application views are + \QC copies the application files to the connected device and runs the + application. The application views are displayed on the device. Command-line output is visible in the \QC \gui {Application Output} view. - Choose \gui {Projects > Desktop > Run} to view the settings for deploying - the application on the connected device and creating the installation - package. For more information, see - \l{Specifying Run Settings for Generic Linux Devices}. + Choose \gui {Projects > Embedded Linux > Run} to view the settings for deploying + the application on the connected device. For more information, see + \l{Specifying Run Settings for Linux-Based Devices}. Debugging works transparently if GDB server is installed on the device and it is compatible with the GDB on the host. diff --git a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc index bd648892ce..b3259e0d5e 100644 --- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc @@ -36,6 +36,6 @@ Choose \gui {Projects > Maemo Run} to view the settings for deploying the application on the connected device and creating the installation package. For more information, see - \l{Specifying Run Settings for Maemo and MeeGo Harmattan Devices}. + \l{Specifying Run Settings for Linux-Based Devices}. Debugging also works transparently. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc deleted file mode 100644 index dd4903b736..0000000000 --- a/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc +++ /dev/null @@ -1,17 +0,0 @@ - \section2 Specifying Run Settings for Generic Linux Devices - - To run an application on a generic Linux device (without MADDE support), - create and select a device configuration in the Desktop run settings for - your project. You can also pass command line arguments to your application. - - \image qtcreator-run-settings-linux-devices.png "Run settings for Generic Linux devices" - - In addition, you must create a connection from the development PC to the - device. Click \gui {Manage device configurations} to create connections. - For more information, see \l {Connecting Generic Linux Devices}. - - When you run the application on the \gui Desktop target, \QC - generates an installation package in the build directory. The name of the - directory is displayed in the \gui {Create tarball} step. \QC copies - the tarball to devices by using the SSH file transfer protocol (SFTP) and - extracts it. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc new file mode 100644 index 0000000000..54da042580 --- /dev/null +++ b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc @@ -0,0 +1,24 @@ + \section2 Specifying Run Settings for Linux-Based Devices + + To run an application on a Linux-based device target (embedded Linux, MeeGo + Harmattan, or Maemo), create and select a device configuration in the run + settings for the project. + You can also pass command line arguments to your application. + + \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices" + + To run and debug applications on Linux-based devices, you must + create connections from the development PC to the devices. Click + \gui {Manage device configurations} to create connections. For more + information, see \l{Configuring Connections to Maemo Devices}, + \l{Configuring Connections to Harmattan Devices}, and + \l {Connecting Embedded Linux Devices}. + + When you run the application, \QC copies the files to the connected device. + + For MeeGo Harmattan and Maemo targets, \QC also generates an + installation package in the build directory by default. You can deliver the + installation package to users for installation + on devices that are of the same type and run the same firmware as the + connected device. For more information, see + \l{Deploying Applications to Linux-Based Devices}. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc deleted file mode 100644 index 31e6753de9..0000000000 --- a/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc +++ /dev/null @@ -1,21 +0,0 @@ - \section2 Specifying Run Settings for Maemo and MeeGo Harmattan Devices - - To run an application on a Maemo or MeeGo Harmattan device, create and - select a device configuration in the Maemo 5 or Harmattan run settings for - your project. - You can also pass command line arguments to your application. - - \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Maemo devices" - - To run and debug applications on Maemo or MeeGo Harmattan devices, you must - create connections from the development PC to the devices. Click - \gui {Manage device configurations} to create connections. For more - information, see \l{Configuring Connections to Maemo Devices} and - \l{Configuring Connections to Harmattan Devices}. - - When you run the application on the \gui{Maemo5} or \gui Harmattan target, - \QC generates a Debian installation package in the build directory by - default. You can deliver the installation package to users for installation - on devices that are of the same type and run the same firmware as the - connected device. For more information, see - \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc index 66c0b6260d..9bd29b5b74 100644 --- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc +++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc @@ -59,7 +59,7 @@ You set the application name and installation folder in the \gui {Run Settings} for the project. For more information, see - \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. \QC + \l{Deploying Applications to Linux-Based Devices}. \QC specifies the correct category settings by default when it creates the Debian directory and the necessary files. diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index deecbb00fe..70dedcab50 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -26,16 +26,17 @@ \page creator-developing-generic-linux.html \nextpage creator-developing-maemo.html - \title Connecting Generic Linux Devices + \title Connecting Embedded Linux Devices - You can connect generic Linux devices to the development PC to build, run, + You can connect embedded Linux devices to the development PC to build, run, debug, and analyze applications on them from \QC. - If you have the tool chain for building applications for generic Linux + If you have a tool chain for building applications for embedded Linux devices (with no MADDE support) installed on the development PC, you can add - it to \QC. + it to \QC. You can then select the \gui {Embedded Linux} target to + run applications on embedded Linux devices. - To be able to run and debug applications on generic Linux devices, you must + To be able to run and debug applications on embedded Linux devices, you must create device configurations and select them in the \QC run settings. @@ -48,7 +49,7 @@ either a password or an SSH key. If you do not have an SSH key, you can create it in \QC. For more information, see \l {Generating SSH Keys}. - To configure connections between \QC and generic Linux devices: + To configure connections between \QC and embedded Linux devices: \list 1 @@ -56,7 +57,7 @@ \o Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to add the Qt version - for the generic Linux. + for the embedded Linux. \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to add the tool @@ -100,7 +101,7 @@ \o Select \gui {Projects > Desktop > Build}. - \o Select the Qt version and tool chain for the generic Linux + \o Select the Qt version and tool chain for the embedded Linux device. \endlist @@ -109,26 +110,19 @@ \list 1 - \o Select \gui {Run > Add > Build Tarball and Deploy to Linux Host} + \o Select \gui {Run > Add > Deploy to Remote Linux Host} to add a new deploy configuration. - \image qtcreator-run-settings-linux-devices.png "Run settings for generic Linux devices" + \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices" \o In the \gui {Device configuration} field, select the device connection. \endlist - When you run the project, \QC creates an installation package in - the build directory. The name of the directory is displayed in the - \gui {Create tarball} step. - - The \gui {Deploy tarball via SFTP upload using device} step specifies - that \QC uploads the tarball to the device and extracts it. - You can add custom deploy steps and remove the default step if - it is incompatible with your steps. - To only create a tarball and not copy the files to the device, - remove all deploy steps. + When you run the project, \QC deploys the application as specified by the + deploy steps. By default, \QC copies the application files to the device. + For more information, see \l{Deploying Applications to Linux-Based Devices}. \endlist diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index 3d3e440225..35e57834c2 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -47,12 +47,14 @@ in the project folder and copies it to the connected device. You can sign the SIS file and wrap it in a Nokia Smart Installer for Symbian package. You can test and debug the application on the device. - \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices} + \o \l{Deploying Applications to Linux-Based Devices} - When you deploy the application on the \gui{Maemo5} or - \gui Harmattan target, \QC generates a Debian installation package - in the build directory and copies it to the connected device. You + When you deploy the application on a Linux-based device target, such + as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC + copies the application files to the connected device. You can test and debug the application on the device. + You can create Debian installation packages for MeeGo Harmattan and + Maemo 5 devices. \endlist \section1 Related Topics diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index bf9c9c3319..498e4964bc 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -36,8 +36,8 @@ You can connect mobile devices to the development PC to build, run, debug, and analyze applications on them from \QC. When you install mobile targets as part of the \QSDK, the build and run settings for the target devices are - set up automatically in \QC. Currently, the tool chain for building - applications for generic Linux devices is not included in \QSDK. + set up automatically in \QC. However, \QSDK does not contain a tool chain + for building applications for embedded Linux devices. 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,9 +45,9 @@ \list - \o \l{Connecting Generic Linux Devices} + \o \l{Connecting Embedded Linux Devices} - If you have the tool chain for building applications for generic + If you have a tool chain for building applications for embedded Linux devices (with no MADDE support) installed on the development PC, you can add it to \QC. Create device configurations and select them in the \QC run settings. diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index de8360c7b5..38bb559ea1 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -51,9 +51,9 @@ \if defined(qcmanual) \input projects/creator-projects-settings-run-desktop.qdocinc \input projects/creator-projects-settings-run-analyze.qdocinc + \input projects/creator-projects-settings-run-debug.qdocinc \input symbian/creator-projects-settings-run-symbian.qdocinc - \input linux-mobile/creator-projects-settings-run-madde.qdocinc - \input linux-mobile/creator-projects-settings-run-generic-linux.qdocinc + \input linux-mobile/creator-projects-settings-run-linux.qdocinc \endif \section1 Specifying a Custom Executable to Run diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index e52e073212..9df8403908 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -219,12 +219,12 @@ \o \l{Deploying to Mobile Devices} \list \o \l{Deploying Applications to Symbian Devices} - \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices} + \o \l{Deploying Applications to Linux-Based Devices} \endlist \o \l{Connecting Mobile Targets} \list \o \l{Connecting MeeGo Harmattan Devices} - \o \l{Connecting Generic Linux Devices} + \o \l{Connecting Embedded Linux Devices} \o \l{Connecting Maemo Devices} \o \l{Connecting Symbian Devices} \endlist diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 08028fbbc3..ed5c07da44 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -37,7 +37,7 @@ \list 1 - \o Select \gui {File > New File or Project > QML > QML File > Choose} + \o Select \gui {File > New File or Project > Qt > QML File > Choose} to create a QML file called Button.qml (for example). \note Components are listed in the \gui Library pane only if the @@ -73,7 +73,8 @@ \o In the \gui Text field, type \bold Button. - You can select the text color, font, size, and style in the + You can select the text color in the \gui Color section and the + font, size, and style in the \gui Font section. \o In the \gui Alignment field, select the center buttons to align @@ -81,7 +82,8 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-anchor-fill-screen.png - button to anchor the text to the whole button area. + (\gui {Fill to Parent}) button to anchor the text to the whole + button area. \endlist @@ -91,9 +93,6 @@ \endlist - \note To view the button, you must add it to a Qt Quick Application or - Qt Quick UI project. - To create a graphical button that scales beautifully without using vector graphics, use the \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html} {Border Image} element. For more information, see @@ -120,7 +119,7 @@ is visible by default. You can specify that it is hidden and the other one becomes visible when the mouse is clicked. - Add a MouseArea that covers the whole area and emits the clicked signal + Add a Mouse Area that covers the whole area and emits the clicked signal (\c {parent.clicked()}) when it detects a mouse click. You can add text to the button and set it up as a property. The text can @@ -135,7 +134,7 @@ \list 1 - \o Select \gui {File > New File or Project > QML > QML File > Choose} + \o Select \gui {File > New File or Project > Qt > QML File > Choose} to create a QML file called Button.qml (for example). \o Double-click the file to open it in the code editor. @@ -158,12 +157,12 @@ \o Click \gui {Design} to edit the file in the visual editor. - \o Drag and drop two \gui BorderImage items from the \gui Library pane + \o Drag and drop two \gui {Border Image} items from the \gui Library pane to the scene. \o Drag and drop a \gui Text item to the scene. - \o Drag and drop a \gui MouseArea to the screen. + \o Drag and drop a \gui {Mouse Area} to the screen. \o In the \gui Navigator pane, select \gui border_image1 to specify settings for it in the \gui Properties pane: @@ -182,7 +181,8 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-anchor-fill-screen.png - button to anchor the border image to the \gui Item. + (\gui {Fill to Parent}) button to anchor the border image to the + \gui Item. \endlist @@ -198,7 +198,7 @@ when it is clicked, for example button_down.png. \o Click \gui {Layout}, and then click the - \inlineimage qmldesigner-anchor-fill-screen.png + \gui {Fill to Parent} button to anchor the border image to the \gui Item. \endlist @@ -215,7 +215,7 @@ enter a pointer to the \c {text} property that you specified earlier: \c {parent.txt}. - \o Select the \gui Aliasing check box to enable smooth text + \o Select the \gui Smooth check box to enable smooth text rendering. \o In the \gui Size field, select \gui {Pixels} to specify the font @@ -227,6 +227,7 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-center-in.png "Anchor buttons" + (\gui {Set Vertical Anchor} and \gui {Set Horizontal Anchor}) buttons to inherit the vertical and horizontal centering from the parent. @@ -247,8 +248,8 @@ \endlist - \note To view the button, you must add it to a Qt Quick Application or Qt - Quick UI project. + \note To test the button, add it to a Qt Quick Application or Qt + Quick UI project and run the application. */ diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index 01069bc6ee..af986b89c6 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -165,7 +165,8 @@ \list 1 - \o In the base state, add all elements you will need in the application. + \o In the base state, add all elements you will need in the + application (1). While you work on one screen, you can click the \inlineimage qmldesigner-show-hide-icon.png icon to hide elements on the canvas that are not part of a screen. @@ -173,7 +174,7 @@ \o In the \gui States pane, click the empty slot to create a new state and give it a name. For example, \c Normal. - \o In the \gui Properties pane, deselect the \gui Visibility check box + \o In the \gui Properties pane (2), deselect the \gui Visibility check box or set \gui Opacity to 0 for each element that is not needed in this view. If you specify the setting for the parent element, all child elements inherit it and are also hidden. diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index 93b27641c8..8e41294edb 100644 --- a/doc/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/src/qtquick/qtquick-toolbars.qdoc @@ -39,7 +39,7 @@ . Select the icon to open the toolbar. To open toolbars immediately when you select a component, select - \gui{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Quick + \gui{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Qt Quick Toolbar}. Drag the toolbar to pin it to another location. Select diff --git a/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc b/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc index df0b537656..676b3b38e0 100644 --- a/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc +++ b/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc @@ -20,8 +20,8 @@ When you deploy the application for the \gui{Symbian Device} target, \QC generates a Symbian installation system (SIS) file in the project folder and copies it to the device that is connected to the development PC. If no - device is connected, you must remove the \gui {Deploy SIS Package} step, - to create the package. Click \gui {Remove Item} to skip the step. + device is connected, you must remove the \gui {Deploy SIS Package} step + to create the package. Click \gui {Remove Item} (1) to skip the step. \image qtcreator-remove-deploy-step.png "Removing deploy steps" |
