diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-04-07 20:40:29 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-04-07 23:13:17 +0300 |
commit | 39ba01da711c07c43abe8aeacedd98990874ba82 (patch) | |
tree | 4a1c8853bd8db754fbf57eac5fff21b7e7342c8a /doc/src/projects | |
parent | a33386e014db5fdf65903654e9b1ae542ee36c0f (diff) | |
parent | 5273ef2a8aa3c8d268b107edc770b53e1aed7803 (diff) | |
download | qt-creator-39ba01da711c07c43abe8aeacedd98990874ba82.tar.gz |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8
Diffstat (limited to 'doc/src/projects')
7 files changed, 52 insertions, 8 deletions
diff --git a/doc/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/src/projects/creator-only/creator-projects-compilers.qdoc index 0e3f89c326..5387e4c680 100644 --- a/doc/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/src/projects/creator-only/creator-projects-compilers.qdoc @@ -64,6 +64,10 @@ \li Clang is a C, C++, Objective C, and Objective C++ front-end for the LLVM compiler for Windows, Linux, and \macos. + \li \l{https://clang.llvm.org/docs/UsersManual.html#clang-cl}{clang-cl} + is an alternative command-line interface to Clang that is compatible + with the Visual C++ compiler, \c cl.exe. + \li Nim is the Nim Compiler for Windows, Linux, and \macos. \li QCC is the interface for compiling C++ applications for QNX. @@ -76,6 +80,12 @@ versions. You can also create a custom ABI definition. For QCC, also specify the path to the QNX Software Development Platform (SDP). + To enable Microsoft Visual C++ Compilers (MSVC) and clang-cl to find system + headers, libraries, and the linker, \QC executes them inside a command + prompt where the environment has been set up using \c {vcvarsall.bat}. For + these compilers, you also specify the path to the script that sets up the + command prompt. + You specify the compiler to use for each kit in \uicontrol Tools > \uicontrol Options > \uicontrol Kits. diff --git a/doc/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/src/projects/creator-only/creator-projects-debuggers.qdoc index 6e9b3013f9..ebd1f6c366 100644 --- a/doc/src/projects/creator-only/creator-projects-debuggers.qdoc +++ b/doc/src/projects/creator-only/creator-projects-debuggers.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -86,4 +86,8 @@ the shell or the device. Usually, you can leave this field empty. \endlist + + To remove the selected manually added debugger, select \uicontrol Remove. + The debugger is removed from the list when you select \uicontrol Apply. + Until then, you can cancel the deletion by clicking \uicontrol Restore. */ diff --git a/doc/src/projects/creator-only/creator-projects-opening.qdoc b/doc/src/projects/creator-only/creator-projects-opening.qdoc index 7fe17582ef..6298c896b5 100644 --- a/doc/src/projects/creator-only/creator-projects-opening.qdoc +++ b/doc/src/projects/creator-only/creator-projects-opening.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -58,6 +58,10 @@ select the \uicontrol Options link, or select \uicontrol Tools > \uicontrol Options > \uicontrol Kits. + Qt for Python projects rely on the \l{Using Language Servers} + {experimental language server client} for code completion, + highlighting, and other useful features. + If \QC cannot find an existing build for a particular \l{glossary-buildandrun-kit}{kit}, it starts out from a clean slate, and creates new debug and release build configurations @@ -79,8 +83,8 @@ \li Select \uicontrol File > \uicontrol {Open File or Project} (\key Ctrl+O or \key Cmd+O on \macos) and select the project file for the project to open: \e {.pro} (qmake), \e {CMakeLists.txt} - (CMake), \e {.qbs} (Qbs), or \e {Makefile.am} (Autotools, - experimental). + (CMake), \e {.qbs} (Qbs), \e {pyproject} (Python), or + \e {Makefile.am} (Autotools, experimental). \li In the \uicontrol {Configure Project} tab, select kits for building and running your project, and click \uicontrol {Configure Project}. diff --git a/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc index 4e3841b4d2..525e7965f4 100644 --- a/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc +++ b/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -48,6 +48,16 @@ switch between them. In addition, you can import and export code style settings. + \image qtcreator-projects-code-style.png "Code Style settings in Projects mode" + + Alternatively, you can enable the Clang Format plugin to enforce + the code style specified in a \c {.clang-format} file. It uses the + \l{https://clang.llvm.org/docs/LibFormat.html}{LibFormat} library for + automatic code formatting and indentation. For more information, see + \l {Automatic Formatting and Indentation}. + + \image qtcreator-code-style-clang-format.png "Clang Format Code Style settings in Projects mode" + To specify global code style settings sets for C++ files, select \uicontrol {Tools > Options > C++}. diff --git a/doc/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/src/projects/creator-only/creator-projects-settings-run.qdoc index 1010186a3f..a67b2052fd 100644 --- a/doc/src/projects/creator-only/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-only/creator-projects-settings-run.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -117,4 +117,6 @@ \image qmldesigner-run-custom-exe.png "Run settings for custom executables" \include qtquick/creator-projects-settings-run-qtquick.qdocinc run settings qt quick ui + \include python/creator-python-run.qdocinc run settings python + */ diff --git a/doc/src/projects/creator-only/creator-projects-targets.qdoc b/doc/src/projects/creator-only/creator-projects-targets.qdoc index b3a4229f14..1d6101b02f 100644 --- a/doc/src/projects/creator-only/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-only/creator-projects-targets.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -53,6 +53,10 @@ \li Bare Metal Device + \li Boot2Qt Device (commercial only) + + \li \l {Emulator}{Boot2Qt Emulator Device} (commercial only) + \li Generic Linux Device \li iOS Device @@ -61,6 +65,12 @@ \li QNX Device + \li Windows Phone + + \li Windows Phone Emulator + + \li Windows Runtime (local) + \endlist To add kits: @@ -95,6 +105,9 @@ \li In the \uicontrol Device field, select a device. + \li In the \uicontrol {Emulator skin} field, select the skin to use for + the \l {Emulator}{Boot2Qt Emulator Device}. + \li In the \uicontrol Sysroot field, specify the directory where the device image is located. If you are not cross-compiling, leave this field empty. diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index caca6bb636..85cb0b287c 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -85,5 +85,6 @@ \if defined(qtcreator) \include qnx/creator-projects-running-qnx.qdocinc running on qnx + \include python/creator-python-run.qdocinc running python \endif */ |