diff options
Diffstat (limited to 'doc/src')
8 files changed, 71 insertions, 37 deletions
diff --git a/doc/src/cmake/creator-projects-cmake-deploying.qdocinc b/doc/src/cmake/creator-projects-cmake-deploying.qdocinc index a5adb5e19e4..a9c53ea4e21 100644 --- a/doc/src/cmake/creator-projects-cmake-deploying.qdocinc +++ b/doc/src/cmake/creator-projects-cmake-deploying.qdocinc @@ -34,10 +34,13 @@ \section1 Deploying CMake Projects to Embedded Linux Devices - \QC cannot extract files to be installed from a CMake project, and - therefore, only executable targets are automatically added to deployment - files. You must specify all other files in the \c {QtCreatorDeployment.txt} - file that you create and place in either the root directory of the CMake + \QC cannot directly extract files to be installed from a CMake project. + Therefore, a special deploy step is created that installs the project into + a local directory. The files in that directory are then deployed to the + remote device. + Alternatively, you can provide a \c {QtCreatorDeployment.txt} file in which + you must specify all files to be deployed which are not executables or + libraries. You place this file in either the root directory of the CMake project or the build directory of the active build configuration. Currently, \QC first checks the root directory and only if no \c {QtCreatorDeployment.txt} exists it checks the active build directory. diff --git a/doc/src/editors/creator-only/creator-code-pasting.qdoc b/doc/src/editors/creator-only/creator-code-pasting.qdoc index 803a15e64aa..b518c8ca3f2 100644 --- a/doc/src/editors/creator-only/creator-code-pasting.qdoc +++ b/doc/src/editors/creator-only/creator-code-pasting.qdoc @@ -38,7 +38,6 @@ \list \li \uicontrol {Pastebin.Com} \li \uicontrol {Pastecode.Xyz} - \li \uicontrol {Paste.KDE.Org} \li \uicontrol {Shared network drives} \endlist diff --git a/doc/src/howto/creator-only/creator-autotest.qdoc b/doc/src/howto/creator-only/creator-autotest.qdoc index 2058581308e..d5ece2aca0d 100644 --- a/doc/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/src/howto/creator-only/creator-autotest.qdoc @@ -240,11 +240,6 @@ \image qtcreator-autotests-options.png - You can add filters to specify the directories within the current project - to scan for tests. Select the \uicontrol {Global Filters} check box, and - then select \uicontrol Add to specify paths to the directories to scan for - tests. Wildcards are not supported in the filter expressions. - In some special setups, \QC cannot deduce which executable or run configuration it should use. If \QC repeatedly asks you to select the tests to run when trying to execute tests, you can enable it to cache diff --git a/doc/src/howto/creator-sidebar-views.qdoc b/doc/src/howto/creator-sidebar-views.qdoc index bda32acb6ae..d92a1067b57 100644 --- a/doc/src/howto/creator-sidebar-views.qdoc +++ b/doc/src/howto/creator-sidebar-views.qdoc @@ -196,6 +196,16 @@ files, as well as compare the selected file with the currently open file in the diff editor. For more information, see \l{Comparing Files}. + \section1 Viewing Open Documents + + To see a list of open documents, switch to the \uicontrol {Open Documents} + view. By right-clicking an open document, you can: + + \list + \li Pin files to ensure they stay at the top of the list and are not + closed when \uicontrol {Close All} is used. + \endlist + \section1 Viewing the File System If you cannot see a file in the \uicontrol Projects view, switch to the diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index f91302ad0c7..2419f499e85 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -459,10 +459,10 @@ To specify settings for displaying application output, select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} > - \uicontrol General. You can select whether to open the - \uicontrol{Application Output} pane on output when running or debugging - applications, to clear old output on a new run, to word-wrap output, and to - limit output to the specified number of lines. + \uicontrol Application Output, or click the \uicontrol {Open Settings Page} + button. You can select whether to open the \uicontrol{Application Output} pane + on output when running or debugging applications, to clear old output on a new run, + to word-wrap output, and to limit output to the specified number of lines. \section1 Compile Output @@ -479,11 +479,14 @@ To specify whether to open the \uicontrol {Compile Output} pane on output when building applications, select \uicontrol Tools > \uicontrol Options > - \uicontrol {Build & Run} > \uicontrol General, and then select the - \uicontrol {Open Compile Output pane when building} check box. - In the \uicontrol {Limit build output to} field, you can specify the maximum + \uicontrol {Build & Run} > \uicontrol Compile Output, and then select the + \uicontrol {Open pane when building} check box. + In the \uicontrol {Limit output to} field, you can specify the maximum amount of build output lines to display in the pane. + You can also reach the options page by clicking the \uicontrol {Open Settings Page} + button. + \if defined(qtcreator) \section1 To-Do Entries diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc index e7fdc6765e7..43bac0ad4c3 100644 --- a/doc/src/overview/creator-acknowledgements.qdoc +++ b/doc/src/overview/creator-acknowledgements.qdoc @@ -168,7 +168,7 @@ The source code of ANGLE is part of the Qt libraries. For more information about the licenses used in Qt GUI, see - \l{https://doc.qt.io/qt-5.9/licenses-used-in-qt.html#qt-gui}{Qt GUI}. + \l{https://doc.qt.io/qt-5.11/licenses-used-in-qt.html#qt-gui}{Qt GUI}. \l{https://spdx.org/licenses/BSD-3-Clause.html} {BSD 3-clause "New" or "Revised" License} diff --git a/doc/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/src/projects/creator-only/creator-projects-compilers.qdoc index 5387e4c6803..6a907233fd2 100644 --- a/doc/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/src/projects/creator-only/creator-projects-compilers.qdoc @@ -74,6 +74,26 @@ \endlist + In addition, the \QC Bare Metal Device plugin provides support for the + following compilers: + + \list + + \li \l{https://www.iar.com/iar-embedded-workbench/}{IAREW} is a group of + C and C++ bare-metal compilers from the various IAR Embedded Workbench + development environments. + \note Currently supported architectures are \c 8051, \c AVR, and \c ARM. + + \li \l{https://www.keil.com}{KEIL} is a group of C and C++ bare-metal + compilers from the various KEIL development environments. + \note Currently supported architectures are \c 8051 and \c ARM. + + \li \l{https://sdcc.sourceforge.net}{SDCC} is a retargetable, optimizing + C bare-metal compiler for various architectures. + \note Currently supported architecture is \c 8051. + + \endlist + To build an application using GCC, MinGW, Clang, or QCC, specify the path to the directory where the compiler is located and select the application binary interface (ABI) version from the list of available diff --git a/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc index c6dc6a24b4c..1e1cad47703 100644 --- a/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc +++ b/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc @@ -98,15 +98,22 @@ \section1 Using Variables in Wizards - You can use variables (\c {%\{<variableName>\}}) in the configuration and - template source files. A set of variables is predefined by the wizards and - their pages. You can introduce new variables as shortcuts to be used later. - Define the variable key names and values in the \c options section in the + You can use variables (\c {%\{<variableName>\}}) in strings in the JSON configuration + file and in template source files. + A set of variables is predefined by the wizards and their pages. + You can introduce new variables as shortcuts to be used later by + defining the variable key names and values in the \c options section in the \c {wizard.json} file. - The variables always return strings. In places where a boolean value is - expected and a string is given, an empty string as well as the string - \c {"false"} is treated as \c false and anything else as \c true. + There is a special variable \c {%\{JS:<JavaScript expression>\}} which evaluates the given + JavaScript expression and converts the resulting JavaScript value to a string. + In the JavaScript expression you can refer to variables defined by the wizard with + \c {value('<variableName>')}. The returned JavaScript object has the type that the value + of the variable has, which can be a string, list, dictionary or boolean. + + In places where a boolean value is expected and a string is given, + an empty string as well as the string \c {"false"} is treated as + \c false and anything else as \c true. \section1 Localizing Wizards @@ -221,7 +228,7 @@ "trDisplayName": "C++ Class", "trDisplayCategory": "C++", "icon": "../../global/genericfilewizard.png", - "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}", + "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", \endcode \list @@ -295,11 +302,11 @@ { "key": "TargetPath", "value": "%{Path}" }, { "key": "HdrPath", "value": "%{Path}/%{HdrFileName}" }, { "key": "SrcPath", "value": "%{Path}/%{SrcFileName}" }, - { "key": "CN", "value": "%{JS: Cpp.className('%{Class}')}" }, - { "key": "Base", "value": "%{JS: ( '%{BaseCB}' === '' ) ? '%{BaseEdit}' : '%{BaseCB}'}" }, - { "key": "isQObject", "value": "%{JS: ('%{Base}' === 'QObject' || '%{Base}' === 'QWidget' || '%{Base}' === 'QMainWindow' || '%{Base}' === 'QDeclarativeItem' || '%{Base}' === 'QQuickItem' ) ? 'yes' : ''}" }, - { "key": "GUARD", "value": "%{JS: Cpp.classToHeaderGuard('%{Class}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" }, - { "key": "SharedDataInit", "value": "%{JS: ('%{IncludeQSharedData}') ? 'data(new %{CN}Data)' : '' }" } + { "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" }, + { "key": "Base", "value": "%{JS: value('BaseCB') === '' ? value('BaseEdit') : value('BaseCB')}" }, + { "key": "isQObject", "value": "%{JS: (value('Base') === 'QObject' || value('Base') === 'QWidget' || value('Base') === 'QMainWindow' || value('Base') === 'QDeclarativeItem' || value('Base') === 'QQuickItem' ) ? 'true' : 'false'}" }, + { "key": "GUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('Class'), Util.preferredSuffix('text/x-c++hdr'))}" }, + { "key": "SharedDataInit", "value": "%{JS: value('IncludeQSharedData') ? 'data(new %{CN}Data)' : '' }" } ], \endcode @@ -712,7 +719,7 @@ { "checkedValue": "QObject", "uncheckedValue": "", - "checked": "%{JS: ('%{BaseCB}' === 'QObject' ) ? 'yes' : ''}" + "checked": "%{JS: value('BaseCB') === 'QObject' ? 'true' : 'false'}" } }, \endcode @@ -788,7 +795,7 @@ "name": "LabelQQC_2_0", "type": "Label", "span": true, - "visible": "%{( '%{CS}' === 'QQC_2_0' )}", + "visible": "%{JS: value('CS') === 'QQC_2_0'}", "data": { "wordWrap": true, @@ -819,7 +826,7 @@ { "name": "BaseEdit", "type": "LineEdit", - "enabled": "%{JS: ( '%{BaseCB}' === '' ) ? 'yes' : ''}", + "enabled": "%{JS: value('BaseCB') === '' ? 'true' : 'false'}", "mandatory": false, "data": { @@ -981,9 +988,6 @@ as the top level directory. This setting defaults to an empty list and no subdirectories will be scanned. - \li \c firstProjectOnly is a boolean value, which will determine whether - all project files that were found will be opened as a project or - only the first one. This setting defaults to \c true. \endlist */ |