diff options
Diffstat (limited to 'doc')
28 files changed, 221 insertions, 115 deletions
diff --git a/doc/images/creator-qbs-build-app.png b/doc/images/creator-qbs-build-app.png Binary files differnew file mode 100644 index 0000000000..17e4684960 --- /dev/null +++ b/doc/images/creator-qbs-build-app.png diff --git a/doc/images/creator-qbs-build-clean.png b/doc/images/creator-qbs-build-clean.png Binary files differnew file mode 100644 index 0000000000..892a42dd57 --- /dev/null +++ b/doc/images/creator-qbs-build-clean.png diff --git a/doc/images/qtcreator-android-deploy-configurations.png b/doc/images/qtcreator-android-deploy-configurations.png Binary files differindex 169b5ce239..ea3f9a9505 100644 --- a/doc/images/qtcreator-android-deploy-configurations.png +++ b/doc/images/qtcreator-android-deploy-configurations.png diff --git a/doc/images/qtcreator-android-manifest-editor.png b/doc/images/qtcreator-android-manifest-editor.png Binary files differindex 13b206f066..31ac17eb1c 100644 --- a/doc/images/qtcreator-android-manifest-editor.png +++ b/doc/images/qtcreator-android-manifest-editor.png diff --git a/doc/images/qtcreator-fakevim-options.png b/doc/images/qtcreator-fakevim-options.png Binary files differindex d5e788eabe..4257cfa098 100644 --- a/doc/images/qtcreator-fakevim-options.png +++ b/doc/images/qtcreator-fakevim-options.png diff --git a/doc/images/qtcreator-kit-selector.png b/doc/images/qtcreator-kit-selector.png Binary files differindex 4319cb32a4..dcd53f7fa9 100644 --- a/doc/images/qtcreator-kit-selector.png +++ b/doc/images/qtcreator-kit-selector.png diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc index a3663c87c4..d0a760c3b2 100644 --- a/doc/src/analyze/creator-analyze.qdoc +++ b/doc/src/analyze/creator-analyze.qdoc @@ -38,10 +38,8 @@ \image qtcreator-analyze-menu.png "Analyze mode menu" - By default, the views in the \gui Analyze mode are locked into place in the - workspace. Select \gui {Window > Views > Locked} to unlock the views. Drag - and drop the views into new positions on the screen. Drag view borders to - resize the views. The size and position of views are saved for future + You can drag and drop the views in the \gui Analyze mode to new positions + on the screen. The size and position of views are saved for future sessions. Select \gui {Window > Views > Reset to Default Layout} to reset the views to their original sizes and positions. diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc index 6df6499b60..6b475066b3 100644 --- a/doc/src/analyze/creator-valgrind.qdoc +++ b/doc/src/analyze/creator-valgrind.qdoc @@ -46,9 +46,7 @@ \li In the \gui Projects mode, select a debug build configuration. - \li Select \gui Analyze to open the \gui Analyze mode. - - \li Select \gui {Analyze Memory} on the toolbar. + \li Select \gui Analyze > \gui {Valgrind Memory Analyzer}. \li Select the \inlineimage qtcreator-analyze-start-button.png "Start button" @@ -156,9 +154,7 @@ \li In the \gui Projects mode, select a release build configuration. - \li Select \gui Analyze to open the \gui Analyze mode. - - \li Select \gui Profile on the toolbar. + \li Select \gui Analyze > \gui {Valgrind Function Profiler}. \li Select the \inlineimage qtcreator-analyze-start-button.png "Start button" diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 3adc7d08e9..1a144cf468 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -190,7 +190,7 @@ information, see the Android documentation. In addition, debugging is supported at android-10 API level, or higher. In - the run settings for the project, in the \gui {Android target SDK} field, + the run settings for the project, in the \gui {Android build SDK} field, select android-10, or higher. For more information about Android API levels, see \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels} {What is API Level?}. diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index 8261e4fb2b..a1202e5d7b 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -146,7 +146,7 @@ \section3 Selecting API Level - In the \gui {Android target SDK} field, you can select the API level to use + In the \gui {Android build SDK} field, you can select the API level to use for building the application. Usually, you should select the newest API level available. @@ -235,6 +235,9 @@ install the application. Android OS then grants the application access to the appropriate data and features. - To add permissions, select \gui Add and select permissions from the list. + Select the \gui {Include default permissions and features for Qt modules} + check box to add the permissions needed by Qt libraries. + + To add permissions, select them in the list, and then select \gui Add. */ diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 9ffea0e51c..3f049c335f 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -412,10 +412,8 @@ \image qtcreator-debugger-views.png "Debug mode views" - By default, the views are locked into place in the workspace. Select - \gui {Window > Views > Locked} to unlock the views. Drag and drop the - views into new positions on the screen. Drag view borders to resize the - views. The size and position of views are saved for future sessions. Select + You can drag and drop the views in \QD to new positions on the screen. + The size and position of views are saved for future sessions. Select \gui {Window > Views > Reset to Default Layout} to reset the views to their original sizes and positions. @@ -894,8 +892,8 @@ Debugging helpers are always automatically used. To force a plain C-like display of structures, select \gui Tools > \gui Options > - \gui Debugger > \gui {Locals & Expressions}, and then select the - \gui{Force Raw Structure Display} check box. For GDB + \gui Debugger > \gui {Locals & Expressions}, and then deselect the + \gui{Use Debugging Helper} check box. For GDB and LLDB this will still use the Python scripts, but generate more basic output. To force plain display for a single object or for all objects of a given type, select the corresponding @@ -1218,7 +1216,7 @@ \li Make sure the debugger is set up properly. For more information, see \l{Setting Up Debugger}. - \li In the \gui Debug mode, select \gui {Windows > Views > Debugger + \li In the \gui Debug mode, select \gui {Window > Views > Debugger Log} to open the \gui {Debugger Log} view. Browse the contents of the pane on the right hand side to find out what went wrong. Always attach the contents of the pane to debugger-related diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 53924284c5..67223821e6 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -142,12 +142,12 @@ \section1 Moving to Symbol Definition or Declaration You can move directly to the definition or the declaration of a symbol by - holding the \key Ctrl and clicking the symbol. If you have multiple splits + holding the \key Ctrl key and clicking the symbol. If you have multiple splits opened, you can open the link in the next split by holding \key Ctrl and - \key Alt while clicking on the symbol. + \key Alt while clicking the symbol. - To enable this moving function, in \gui Tools > \gui{Options} > - \gui{Text Editor} > \gui Behavior, select \gui{Enable mouse navigation}. + To enable this moving function, select \gui Tools > \gui{Options} > + \gui{Text Editor} > \gui Behavior > \gui{Enable mouse navigation}. You can also select the symbol and press \key F2, or right-click the symbol and select \gui {Follow Symbol Under Cursor} to move to its definition or diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc index d339e9da4d..69d596feee 100644 --- a/doc/src/howto/creator-cli.qdoc +++ b/doc/src/howto/creator-cli.qdoc @@ -42,7 +42,7 @@ between the filename and line number. You can also use a space between the separator and the line number. - For example: + For example, on Windows: \list @@ -54,6 +54,14 @@ \endlist + On OS X: + + \list + + \li \c {Qt Creator.app/Contents/MacOS/Qt Creator -help} + + \endlist + To open a project that is located in a particular folder, you can pass on the folder name as a command line argument. \QC looks for a session that matches the folder name and loads it. Or it looks for a project file in the folder and opens it. For example: @@ -89,6 +97,16 @@ \li Attempt to connect to an already running instance of \QC. \row + \li -pid + \li Attempt to connect to an already running instance of \QC with + the specified process ID. + + \row + \li -block + \li Open files in editors in a running \QC instance and block the + command line until the first editor is closed. + + \row \li -load <plugin> \li Load the specified plugin. @@ -113,6 +131,11 @@ \li -color <color> \li Core plugin: override the selected UI color. + \row + \li -presentationMode + \li Core plugin: display keyboard shortcuts as popups when you + press them. Mostly useful when presenting \QC to someone else. + \row \li -debug <pid> \li Debugger plugin: attach to the process with the given process ID. @@ -146,9 +169,9 @@ and sysroots. \row - \li -wincrashevent <event-handle> + \li -wincrashevent <event-handle:pid> \li Debugger plugin: Attach to crashed processes by using the specified - event handle. + event handle and process ID. \row \li -customwizard-verbose @@ -162,10 +185,6 @@ Open the projects and files that were open when you last exited \QC. For more information about managing sessions, see \l{Managing Sessions}. - \row - \li -block - \li Open files in editors in a running \QC instance and block the - command line until the first editor is closed. \endtable \section1 Using Custom Styles diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index df8e4637f0..0369702c01 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -43,11 +43,12 @@ code and translations. The lrelease tool is used to create run-time translation files for use by the released application. - To synchronize ts files from a translator with the application code, + To synchronize translation source (TS) files from a translator with the + application code, select \gui {Tools > External > Text > Linguist > Update Translations (lupdate)}. - To generate from the ts files qm translation files that can be used by an + To generate from the TS files Qt message (QM) files that can be used by an application, select \gui {Tools > External > Text > Linguist > Release Translations (lrelease)}. diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 5b35e2f064..02abcec556 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -96,9 +96,9 @@ to \c %HOMEDRIVE%%HOMEPATH% when the Git executable is run and authorization works as it would with \c {git bash}. - \section1 Setting Up Common Options + \section1 Setting Up General Options - Select \gui{Tools} > \gui{Options} > \gui{Version Control} > \gui{Common} + Select \gui{Tools} > \gui{Options} > \gui{Version Control} > \gui{General} to specify settings for submit messages: \list @@ -109,33 +109,36 @@ parameter. If there is an error, the script should output a message on standard error and return a non-zero exit code. - \li \gui{User/alias configuration file} takes a file in mailmap format - that lists user names and aliases. For example: + \li \gui{User/alias configuration file} is a text file that lists + author names in mailmap format. For each author, you must specify a + real name and email address and optionally an alias and a second + email address. For example: \code - Jon Doe <Jon.Doe@company.com> + Jon Doe <Jon.Doe@company.com> jdoe <jdoe@somemail.com> Hans Mustermann <Hans.Mustermann@company.com> hm <info@company.com> \endcode - \note The second line above specifies the alias \e{hm} and the - corresponding email address for \e{Hans Mustermann}. If the - user/alias configuration file is present, the submit editor - displays a context menu with \gui{Insert name} that pops up a - dialog letting the user select a name. + After you specify a file in this field, you can select authors + as values of the submit message fields in the \gui Nicknames dialog. \li \gui{User fields configuration file} is a simple text file consisting of lines specifying submit message fields that take - user names, for example: + authors as values, for example: \code - Reviewed-by: + Acked-by: + Initial-patch-by: + Reported-by: + Rubber-stamped-by: Signed-off-by: + Tested-by: \endcode - The fields above appear below the submit message. They provide - completion for the aliases/public user names specified in the - \e{User/alias configuration file} as well as a button that opens the - aforementioned user name dialog. + After you specify a file in this field, you can add authors as + values of the submit message fields when submitting changes. If + you also specified a \gui{User/alias configuration file}, you can + select authors in the \gui Nicknames dialog. \li \gui{SSH prompt command} specifies an ssh-askpass command that you can use (on Linux) to prompt the user for a password when using SSH. 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 e0f8398459..e276915812 100644 --- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc @@ -1,8 +1,6 @@ \section1 Running on Embedded Linux Devices - \list 1 - - \li Build and run the application for a device: + To build and run the application for a device: \list 1 @@ -13,8 +11,6 @@ \endlist - \endlist - \QC uses the compiler specified in the project build settings (tool chain) to build the application. diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc index ccbedf5770..59ccb91dd8 100644 --- a/doc/src/projects/creator-projects-building.qdoc +++ b/doc/src/projects/creator-projects-building.qdoc @@ -48,12 +48,17 @@ \list 1 - \li Select a \l{glossary-buildandrun-kit}{kit} for the project. + \li Click the \gui {Build and Run Kit Selector} icon (1) or select + \gui Build > \gui {Open Build and Run Kit Selector} to select the + build and run \l{glossary-buildandrun-kit}{kit}. \image qtcreator-kit-selector.png "Kit selector" \li Choose \gui {Build > Build Project} or press \key {Ctrl+B}. + You can also select the \gui Run button (2) to also deploy and run + the application after building it. + \endlist For more information on the options you have, see @@ -63,4 +68,10 @@ subproject, you can use the \gui Build menu commands to build a file or subproject. + To remove all build artifacts, select \gui Build > \gui {Clean All} or + \gui {Clean Project}. To clean the build directory and then build the + project, select \gui Build > \gui {Rebuild All} or \gui {Rebuild Project}. + + To run qmake to generate new Makefiles, select \gui Build > \gui qmake. + */ diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc index a04763e50d..9c8b246e94 100644 --- a/doc/src/projects/creator-projects-qbs.qdoc +++ b/doc/src/projects/creator-projects-qbs.qdoc @@ -39,6 +39,8 @@ selecting \gui Help > \gui {About Plugins} > \gui {Build Systems} > \gui {QbsProjectManager} and restarting \QC. + \section1 Building Qbs + To build the Qbs plugin yourself from the \QC git repository: \list 1 @@ -46,7 +48,7 @@ \li Fetch the Qbs submodule in your \QC git checkout with \c {git submodule update --init}. - \li Run qmake on \QC and build \QC again. + \li Use Qbs or qmake and make to build \QC again. \li Enable the Qbs plugin as described above. @@ -69,10 +71,88 @@ \c Depends item for a Qt application. For examples, see the \c {examples} directory in the qbs repository. + \li Select \gui Projects to specify \gui {Build Settings} for the + project. + + \li Select \gui {Build Steps} > \gui Details to specify build steps: + + \image creator-qbs-build-app.png + + \list 1 + + \li In the \gui {Build variant} field, select \gui Debug to + include debug symbols in the build for debugging the + application and \gui Release to create the final + installation file. + + \li In the \gui {Parallel jobs} field, specify the number of + parallel jobs to use for building. + + \li Select the \gui {Enable QML debugging} check box to debug + Qt Quick application projects. + + \note Debugging requires opening a socket at a well-known + port, which presents a security risk. Anyone on the Internet + could connect to the application that you are debugging and + execute any JavaScript functions. Therefore, you must make + sure that the port is properly protected by a firewall. + + \li In the \gui Properties field, specify the properties to pass + to the project. Use colons (:) to separate keys from values. + For more information, see + \l{http://qt-project.org/doc/qbs/language-introduction.html} + {Modules} in the Qbs Manual. + + \li In the \gui Flags field: + + \list + + \li Select \gui {Dry run} to test building without + executing commands or making permanent + changes to the build graph. + + \li Select \gui {Keep going} to continue building when + errors occur, if possible. + + \li Select \gui {Check timestamps} to retrieve the + timestamps from the file system instead of using the + ones stored in the build graph. You only need this + option if you made changes to the build directory + manually, which is not recommended. + + \endlist + + \endlist + + The \gui {Equivalent command line} field displays the build command + that is constructed based on the selected options. + + \li Select \gui {Clean Steps} > \gui Details to specify flags for the + cleaning step. + + \image creator-qbs-build-clean.png + + \list + + \li Select \gui {Clean all artifacts} to remove all build + artifacts. + + \li Select \gui {Dry run} to test cleaning without executing + commands or making permanent changes to the build graph. + + \li Select \gui {Keep going} to continue cleaning when errors + occur, if possible. + + \endlist + + The \gui {Equivalent command line} field displays the clean command + that is constructed based on the selected options. + + \li Select \gui Build > \gui {Build Project} to build the application. + \li Click the \inlineimage qtcreator-run.png - (\gui Run) button to build, deploy, and run the application. - + (\gui Run) button to deploy and run the application. \endlist */ diff --git a/doc/src/projects/creator-projects-running-desktop.qdocinc b/doc/src/projects/creator-projects-running-desktop.qdocinc deleted file mode 100644 index 5782622658..0000000000 --- a/doc/src/projects/creator-projects-running-desktop.qdocinc +++ /dev/null @@ -1,11 +0,0 @@ - \section1 Running on Desktop - - \list 1 - - \li Select \gui Desktop as the build and run \l{glossary-buildandrun-kit}{kit}. - - \image qtcreator-kit-selector.png "Kit selector" - - \li Click the \gui Run button. - - \endlist diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 534bec7690..48d7866f64 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -34,14 +34,28 @@ location from where it can be run on the desktop, on a device emulator or simulator, or on a mobile device that is connected to the development PC. - To run executable files without deploying them first, deselect the - \gui {Tools > Options > Project > Always deploy project before running it} - option. + To run executable files without deploying them first, select \gui Build > + \gui {Run Without Deployment}. To make this the default option, deselect the + \gui Tools > \gui Options > \gui Project > + \gui {Always deploy project before running it} option. + + To run applications: + + \list 1 + + \li Click the \gui {Build and Run Kit Selector} icon (1) or select + \gui Build > \gui {Open Build and Run Kit Selector} to select the + build and run \l{glossary-buildandrun-kit}{kit}. + + \image qtcreator-kit-selector.png "Kit selector" + + \li Click the \gui Run button (2). + + \endlist For more information on the options you have, see \l{Specifying Run Settings}. - \include projects/creator-projects-running-desktop.qdocinc \include linux-mobile/creator-projects-running-generic-linux.qdocinc \include qnx/creator-projects-running-qnx.qdocinc */ diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 67fc627391..029ea38fed 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -120,6 +120,9 @@ the build step and add a custom build step that specifies another shell command. + \note For more information about the build steps when using Qbs, see + \l{Building Applications with Qbs}. + \section2 Adding Custom Build Steps To add custom steps to the build settings, select \gui {Add Build Step > @@ -156,6 +159,9 @@ (\gui {Move Up} and \gui {Move Down}). \endlist + \note For more information about the cleaning steps when using Qbs, see + \l{Building Applications with Qbs}. + \section1 Build Environment You can specify the environment you want to use for building in the diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 307d22c29e..c54a065498 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -43,14 +43,14 @@ \li \l {Creating Components} - You can use predefined QML types to create components or use a set - of Qt Quick Controls for creating classic desktop-style user - interfaces using Qt Quick 2.1 (available since Qt 5.1). + You can use basic QML types to create your own components that you + can combine with ready-made Qt Quick Controls and Layouts + (available since Qt 5.1). \li \l {Creating Screens} - You can use predefined QML types, Qt Quick Controls, and your own - components to create screens. You can use states and transitions to - navigate between screens. + You can combine basic QML types with ready-made Qt Quick Controls, + Dialogs, and Layouts (available since Qt 5.1) to create screens. You + can use states and transitions to navigate between screens. \li \l {Exporting Designs from Graphics Software} You can export designs from graphics software, such as Adobe diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index 4980510261..07fb88aeb5 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -71,14 +71,11 @@ \endlist - QML types allow you to write cross-platform applications with custom look - and feel. You can also use ready-made Qt Quick 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. - - Qt Quick 1 Components are a part of Qt 4, whereas Qt Quick Controls were - added to Qt 5.1. + 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, Qt Quick Controls, Dialogs, and Layouts are available for + creating classic desktop-style user interfaces using Qt Quick 2.1. You can + use the Qt Quick Controls Styles to customize Qt Quick Controls. 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 8c0117a25b..8870e7c1ad 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -68,10 +68,10 @@ \gui {Qt Quick UI} > \gui Choose. \li In the \gui {Qt Quick component set} field, select the component set - to use for the project. The Qt Quick imports enable you to create - cross-platform applications with a custom look and feel, whereas the - Qt Quick Controls provide the look and feel for a particular - platform: + to use for the project. The Qt Quick imports enable you to use the + basic QML types to create user interfaces, whereas the Qt Quick + Controls provide a set of ready-made controls that you can customize + by using Qt Quick Controls Styles: \list @@ -85,6 +85,10 @@ \endlist + You can add imports later to combine Qt Quick basic types with Qt Quick + Controls, Qt Quick Dialogs, and Qt Quick Layouts (available since + Qt 5.1). + \endlist \QC creates the following files: diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index c6b22bb80a..cc8b45025e 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -143,9 +143,9 @@ components, basic types, layouts, positioner types, and views. Sets of UI components with the look and feel of a particular mobile device - platform have been defined for Qt Quick 1. Since Qt 5.1, a set of Qt Quick - Controls is available for creating classic desktop-style user interfaces - using Qt Quick 2.1. The Qt Quick Components and Controls are based on + platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt + Quick Controls, Dialogs, and Layouts are available for creating user + interfaces using Qt Quick 2.1. The components and controls are based on standard QML types. To view the components and controls in the \gui {Library} pane, import the component sets in the \gui Imports pane. diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index 283fcc9f4f..0f7ce685fd 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -40,9 +40,9 @@ 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. Qt Quick 1 Components are - a part of Qt 4, whereas Qt Quick Controls were added to Qt 5.1. + Since Qt 5.1, Qt Quick Controls, Dialogs, and Layouts are available for + creating classic desktop-style user interfaces using Qt Quick 2.1. You can + use the Qt Quick Controls Styles to customize Qt Quick Controls. \section1 Adding Components to Screens @@ -347,10 +347,6 @@ \li \l{Flickable} items can be flicked horizontally or vertically. - \li \l{Flipable} - items can be flipped between their front and back sides by using - rotation, state, and transition. - \li FocusScope assists in keyboard focus handling when building reusable QML components. @@ -394,18 +390,24 @@ down buttons, by pressing up or down on the keyboard, or by entering a value in the box. + \omit + Not visible in the item library in 3.2. \li StatusBar contains status information in your application. It does not provide a layout of its own, but requires you to position its contents, for instance by creating a \gui {Row Layout}. + \endomit \li TextArea displays multiple lines of editable formatted text. \li TextField displays a single line of editable plain text. + \omit + Not visible in the item library in 3.2. \li ToolBar provides styling for ToolButton as well as other controls that it can contain. However, it does not provide a layout of its own, but requires you to position its contents, for instance by creating a \gui {Row Layout}. + \endomit \li ToolButton provides a button that is functionally similar to \gui Button, but that looks more suitable on a \gui {Tool Bar}. diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc index 989e65a1a3..ce7dfeb765 100644 --- a/doc/src/widgets/qtdesigner-overview.qdoc +++ b/doc/src/widgets/qtdesigner-overview.qdoc @@ -61,18 +61,7 @@ \section1 Specifying Settings for Qt Designer - To change the layout of \QD user interface elements: - - \list 1 - - \li Select \gui Tools > \gui{Form Editor} > \gui Views > \gui Locked. - - When this option is not checked, you can change the layout. - - \li Click the header of an element and drag the element to a new - position. - - \endlist + You can drag and drop the views in \QD to new positions on the screen. To specify settings for \QD: diff --git a/doc/src/winrt/creator-winrt.qdoc b/doc/src/winrt/creator-winrt.qdoc index ba6b744010..58228be6e5 100644 --- a/doc/src/winrt/creator-winrt.qdoc +++ b/doc/src/winrt/creator-winrt.qdoc @@ -42,7 +42,7 @@ \list 1 \li Select \gui Help > \gui {About Plugins} > \gui {Device Support} > - \gui WinRT to enable the experimental Winows Runtime plugin. + \gui WinRT to enable the experimental Windows Runtime plugin. \li Restart \QC to be able to use the plugin. @@ -55,7 +55,7 @@ \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to add a kit for building and running applications on Windows - Runtime devices (the local computer, for now) Windows Phones, + Runtime devices (the local computer, for now), Windows Phones, or the Windows Phone emulator. \endlist |
