Commit 1853f01a authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Ulf Hermann

Merge remote-tracking branch 'origin/4.1'

Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
parents 713bc04a d004203b
CONFIG += c++14
......@@ -21,6 +21,8 @@ Editing
* Added highlighting of automatically inserted characters
* Added option for skipping automatically inserted character, and changed
it to be done only if the cursor stays before the character
* Added `Modnokai Night Shift v2`, `Qt Creator Dark`,
`Solarized Dark` and `Solarized Light` editor schemes
* Fixed that replacing could change selection (QTCREATORBUG-15623)
All Projects
......@@ -90,6 +92,7 @@ Qt Quick Designer
* Added support for Qt Quick Controls 2 styles
* Added `Move to Component` action
* Added `Add New Signal Handler` action
* Added support of Qt Creator themes in the Designer UI
* Improved performance
* Improved error dialog (QTCREATORBUG-15772)
* Fixed crumble bar for component navigation
......@@ -152,11 +155,14 @@ Credits for these changes go to:
Albert Astals Cid
Alessandro Portale
Alexander Drozdov
Alexandru Croitor
Andre Hartmann
André Pönitz
Antoine Poliakov
Anton Kudryavtsev
Arnold Dumas
BogDan Vatra
Brett Stottlemyer
Christian Kandeler
Christian Stenger
Cristian Adam
......@@ -171,20 +177,25 @@ Jake Petroules
Jaroslaw Kobus
Jean Gressmann
Jochen Becher
Lars Knoll
Leena Miettinen
Lorenz Haas
Lukas Holecek
Marc Mutz
Marc Reilly
Marco Benelli
Marco Bubke
Marc Reilly
Mashrab Kuvatov
Mat Sutcliffe
Maurice Kalinowski
Nazar Gerasymchuk
Nikita Baryshnikov
Nikolai Kosjar
Orgad Shaneh
Oswald Buddenhagen
Philip Lorenz
Robert Löhning
Serhii Moroz
Shinnok
Takumi ASAKI
Thiago Macieira
......
......@@ -156,7 +156,7 @@
\section2 Taking Screen Shots
\QC has the native look and feel on Windows, Linux, and OS X, and therefore,
\QC has the native look and feel on Windows, Linux, and \macos, and therefore,
screen shots can end up looking very different, depending on who takes them
and which system they use. To try to preserve a consistent look and feel in
the \QC Manual, observe the guidelines listed in this section when taking
......@@ -207,7 +207,7 @@
You can use a web service, such as \l{https://tinypng.com}, or an image
optimization tool to shrink the images. For example, you can use the Radical
Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on
OS X (much less efficient), or some other tool available on Linux.
\macos (much less efficient), or some other tool available on Linux.
With ImageOptim, you simply drag and drop the image files to the
application. The following section describes the settings to use for RIOT.
......@@ -278,7 +278,7 @@
\list
\li nmake docs (on Windows)
\li make docs (on Linux and OS X)
\li make docs (on Linux and \macos)
\endlist
The \QC Manual HTML files are generated in the \c {doc/html} directory.
......@@ -286,7 +286,7 @@
\c {doc/html-dev} directory. The help files (\c {.qch}) are generated in the
\c {share/doc/qtcreator} directory in the \QC build directory on Windows and
Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
on OS X. You can view the HTML files in a browser and the help files in
on \macos. You can view the HTML files in a browser and the help files in
the \QC \uicontrol Help mode. For more information about adding the help
files to \QC, see
\l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation}
......
......@@ -12,6 +12,7 @@ macro.hr.HTML = "<hr />"
macro.iacute.HTML = "&iacute;"
macro.key = "\\b"
macro.menu = "\\b"
macro.macos = "macOS"
macro.note = "\\b{Note:}"
macro.oslash.HTML = "&oslash;"
macro.ouml.HTML = "&ouml;"
......
doc/images/beautifier_options.png

8.16 KB | W: | H:

doc/images/beautifier_options.png

9.36 KB | W: | H:

doc/images/beautifier_options.png
doc/images/beautifier_options.png
doc/images/beautifier_options.png
doc/images/beautifier_options.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/cpu-usage-analyzer.png

30.2 KB | W: | H:

doc/images/cpu-usage-analyzer.png

64.5 KB | W: | H:

doc/images/cpu-usage-analyzer.png
doc/images/cpu-usage-analyzer.png
doc/images/cpu-usage-analyzer.png
doc/images/cpu-usage-analyzer.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-external-tools.png

25.8 KB | W: | H:

doc/images/qtcreator-external-tools.png

16.6 KB | W: | H:

doc/images/qtcreator-external-tools.png
doc/images/qtcreator-external-tools.png
doc/images/qtcreator-external-tools.png
doc/images/qtcreator-external-tools.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -47,7 +47,7 @@
for which you set up a project in \QC and applications for which you do not
have a project.
Valgrind tools are supported locally only on Linux and OS X. However,
Valgrind tools are supported locally only on Linux and \macos. However,
according to Valgrind.org, support on OS X 10.8 and 10.9 is experimental and
mostly broken. You can run the tools on a remote Linux machine or device
from any development host.
......
......@@ -64,7 +64,7 @@
the Symbol Server provided by Microsoft to the symbol search path of the
debugger. For more information, see \l{Setting CDB Paths on Windows}.
\note To use the Free Software Foundation (FSF) version of GDB on OS X, you
\note To use the Free Software Foundation (FSF) version of GDB on \macos, you
must sign it and modify your \l{glossary-buildandrun-kit}{kit} settings.
This section explains the options you have for debugging C++ code and
......@@ -79,7 +79,7 @@
Qt Creator supports 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. On OS X, the LLDB debugger can be used. Basic
Debugger CDB, is needed. On \macos, the LLDB debugger can be used. Basic
support for LLDB is also available on Linux, but it is restricted by LLDB's
capabilities there, and considered experimental.
......@@ -99,7 +99,7 @@
\li GCC, ICC
\li GDB
\row
\li OS X
\li \macos
\li GCC, Clang
\li LLDB, FSF GDB (experimental)
\row
......@@ -130,11 +130,11 @@
\section2 Supported LLDB Versions
The LLDB native debugger has similar functionality to the GDB debugger. LLDB
is the default debugger in Xcode on OS X for supporting C++ on the desktop.
is the default debugger in Xcode on \macos for supporting C++ on the desktop.
LLDB is typically used with the Clang compiler (even though you can use it
with GCC, too).
On OS X you can use the LLDB version delivered with Xcode or build from source.
On \macos you can use the LLDB version delivered with Xcode or build from source.
The minimum supported version is LLDB 320.4.
On Linux, the minimum supported version is LLDB 3.8.
......@@ -184,7 +184,7 @@
most Linux distributions the GDB builds shipped with the system
are sufficient. You can also build your own. Follow the
instructions in \l{http://wiki.qt.io/QtCreator_Build_Gdb}
{Building GDB}. Builds of GDB shipped with Xcode on OS X are no
{Building GDB}. Builds of GDB shipped with Xcode on \macos are no
longer supported.
\row
......@@ -211,7 +211,7 @@
\l{Setting CDB Paths on Windows}.
\row
\li Debugging tools for OS X
\li Debugging tools for \macos
\li The Qt binary distribution contains both debug and release
variants of the libraries. But you have to explicitly tell the
runtime linker that you want to use the debug libraries even if
......@@ -223,7 +223,7 @@
\uicontrol Projects mode. In the run configuration, select
\uicontrol{Use debug version of frameworks}.
For more detailed information about debugging on OS X,
For more detailed information about debugging on \macos,
see: \l{http://developer.apple.com/library/mac/#technotes/tn2124/_index.html#//apple_ref/doc/uid/DTS10003391}
{Mac OS X Debugging Magic}.
......@@ -282,9 +282,9 @@
directly from version control or the web, enter the following string in
the \uicontrol {Source Paths} field: \c srv*.
\section1 Setting up FSF GDB for OS X
\section1 Setting up FSF GDB for \macos
To use FSF GDB on OS X, you must sign it and add it to the \QC
To use FSF GDB on \macos, you must sign it and add it to the \QC
\l{glossary-buildandrun-kit}{kits}.
\list 1
......
......@@ -448,18 +448,18 @@
\li To finish debugging, press \key {Shift+F5}.
\li To execute a line of code as a whole, press \key F10
(\key {Command+Shift+O} on OS X).
(\key {Command+Shift+O} on \macos).
\li To step into a function or a subfunction, press \key F11
(\key {Command+Shift+I} on OS X).
(\key {Command+Shift+I} on \macos).
\li To leave the current function or subfunction, press \key {Shift+F11}
(\key {Command+Shift+T} on OS X).
(\key {Command+Shift+T} on \macos).
\li To continue running the program, press \key F5.
\li To run to the line containing the cursor, press \key {Ctrl+F10}
(\key {Shift+F8} on OS X).
(\key {Shift+F8} on \macos).
\li To run to the selected function when you are stepping into a nested
function, press \key {Ctrl+F6}.
......@@ -521,7 +521,7 @@
\list
\li In the code editor, click the left margin or press \key F9
(\key F8 for OS X) at a particular line you want the
(\key F8 for \macos) at a particular line you want the
program to stop.
\li In the \uicontrol Breakpoints view, double-click in the empty
......@@ -685,7 +685,7 @@
\row
\li GDB and LLDB, and therefore \QC's debugger, also work for optimized
builds on Linux and OS X. Optimization can lead to re-ordering
builds on Linux and \macos. Optimization can lead to re-ordering
of instructions or removal of some local variables, causing the
\uicontrol {Locals and Expressions} view to show unexpected
data.
......@@ -780,11 +780,11 @@
For more information, see \l{Using Command Line Options}.
\section2 Stepping into Frameworks in OS X
\section2 Stepping into Frameworks in \macos
In OS X, external libraries are usually built into so-called Frameworks,
In \macos, external libraries are usually built into so-called Frameworks,
which may contain both release and debug versions of the library. When you
run applications on the OS X desktop, the release version of Frameworks is
run applications on the \macos desktop, the release version of Frameworks is
used by default. To step into Frameworks, select the
\uicontrol {Use debug versions of Frameworks} option in the project run
settings.
......@@ -801,7 +801,7 @@
The \uicontrol Modules view displays information that the debugger plugin
has about modules included in the application that is being debugged. A
module is a dynamic link library (\c {.dll}) in Windows, a shared object
(\c {.so}) in Linux, and a dynamic shared library (\c {.dylib}) in OS X.
(\c {.so}) in Linux, and a dynamic shared library (\c {.dylib}) in \macos.
In addition, the view displays symbols within the modules and indicates
where each module was loaded.
......
......@@ -76,8 +76,26 @@
\li Restart \QC to be able to use the plugin.
\li Select \uicontrol Tools > \uicontrol Options > \uicontrol Beautifier
to specify settings for the tool you want to use.
\li Select \uicontrol Tools > \uicontrol Options >
\uicontrol Beautifier to specify settings for beautifying files.
\li Select the \uicontrol {Enable auto format on file save} check box to
automatically beautify files when you save them using the tool you
select in the \uicontrol Tool field.
\image qt-creator-beautifier-options-general.png
\li In the \uicontrol {Restrict to MIME types} field, define the MIME
types of the files to beautify, separated by semicolons. Leave the
field empty to apply the tool on all files.
\li Select the \uicontrol {Restrict to files contained in the current
project} check box to only beautify files that belong to the
current project.
\li Select \uicontrol {Artistic Style}, \uicontrol {Clang Format}, or
\uicontrol Uncrustify to specify settings for the tool you want to
use.
\image beautifier_options.png
......@@ -86,10 +104,6 @@
\uicontrol {Clang Format command}, or
\uicontrol {Uncrustify command} field.
\li In the \uicontrol {Restrict to MIME types} field, define the MIME
types of the files to beautify, separated by semicolons. Leave the
field empty to apply the tool on all files.
\li In the \uicontrol Options group, select the configuration file that
defines the style to use in the source files. If you select several
options, they are applied from top down.
......@@ -117,8 +131,8 @@
\endlist
\li Select \uicontrol Tools > \uicontrol Beautifier >
\uicontrol {Artistic Style}, \uicontrol ClangFormat, or
\li Select \uicontrol Tools > \uicontrol Options > \uicontrol Beautifier
> \uicontrol {Artistic Style}, \uicontrol ClangFormat, or
\uicontrol Uncrustify > \uicontrol {Format Current File} to format
the currently open file.
......@@ -133,21 +147,4 @@
file in this case when using Clang, select the
\uicontrol {Format entire file if no text was selected} check box in the
\uicontrol {Clang Format} options.
To automatically format files when they are saved, select \uicontrol Tools >
\uicontrol Beautifier > \uicontrol General:
\list 1
\li In the \uicontrol Tool field, select the tool for formatting.
\li In the \uicontrol {Restrict to MIME types} field, specify a
semicolon-separated list of MIME types. One of these types must
match the MIME type of the file that is auto formatted.
An empty list accepts all files.
\li Select the \uicontrol {Restrict to files contained in the current
project} check box to only auto format files in the current project.
\endlist
*/
......@@ -84,8 +84,37 @@
include several files, processing a single file and all the included files
can take a while.
To make parsing faster, pre-compiled headers are ignored by default. You can
specify that Clang processes them in \uicontrol {Code Model} options.
To make parsing faster, pre-compiled headers are ignored by default. To
specify that Clang processes them, select \uicontrol Tools >
\uicontrol Options > \uicontrol C++ > \uicontrol {Code Model}, and
deselect the \uicontrol {Ignore pre-compiled headers} check box.
When Clang encounters risky or possibly erroneous constructions, it issues
warnings. To request or suppress warnings, select \uicontrol Tools >
\uicontrol Options > \uicontrol C++ > \uicontrol {Code Model}. You can
either select one of the predefined configurations, or create a copy of a
configuration and edit it to fit your needs:
\list
\li \uicontrol {Pedantic Warnings} uses the \c -Wpendantic option that
requests all the warnings demanded by strict ISO C and ISO C++.
\li \uicontrol {Warnings for Questionable Constructs} combines the
\c -Wall and \c -Wextra options to request all warnings about easily
avoidable questionable constructions and some additional warnings.
\li \uicontrol {Warnings for Almost Everything} uses the \c -Weverything
option with negative options to suppress some warnings.
\endlist
You can edit the predefined configurations to request specific warnings
beginning with \c -W. Each of these warnings also has a negative version
that begins with \c -Wno. Keep in mind that some options turn on other
options. For more information, see
\l{https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html}
{Options to Request or Suppress Warnings} or the GCC or Clang manual pages.
The following services are currently implemented in the experimental Clang
code model plugin:
......@@ -147,8 +176,17 @@
\li Restart \QC to be able to use the plugin.
\li To process pre-compiled headers before processing any project files,
deselect the \uicontrol {Ignore pre-compiled headers} check box.
\li To specify settings for the Clang code model, select
\uicontrol Tools > \uicontrol Options > \uicontrol C++ >
\uicontrol {Code Model}.
\image qtcreator-clang-code-model-options.png
\li In the \uicontrol {Configuration to use} list, select the
warnings to request.
\li To have Clang process pre-compiled headers, deselect the
\uicontrol {Ignore pre-compiled headers} check box.
\endlist
......
......@@ -65,7 +65,7 @@
alphabetic order.
To jump to a line and column in the current file, select the line and column
indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on OS X) to open the
indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on \macos) to open the
locator. Enter the line number and column number in the locator, separated
by a colon (:).
......
......@@ -142,6 +142,17 @@
\uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
\uicontrol Display and deselect \uicontrol {Animate matching parentheses}.
You can use keyboard shortcuts to move within and between blocks. To go to
block end, press \key {Ctrl+]} and to go to block start, press
\key {Ctrl+[}. To also select the lines from the cursor position to the end
or beginning of the block, press \key {Ctrl+Shift+]} and
\key {Ctrl+Shift+[}, respectively.
To select the current block, press \key Ctrl+U. A second key press extends
the selection to the parent block. To undo the last selection, press
\key {Ctrl+Alt+Shift+U}. To enable smart block selection, select
\uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
\uicontrol Behavior > \uicontrol {Enable smart selection changing}.
*/
......@@ -193,7 +204,7 @@
schemas. \QC looks for a JSON schema file with a
name that matches the name of the JSON instance file in the user
configuration folder. For example, \c {~/config/QtProject/qtcreator/json} on
Linux and OS X and
Linux and \macos and
\c {C:\Users\username\AppData\Roaming\QtCreator\qtcreator\json}
in Windows. To check JSON data structure, copy the JSON schema file to the
above folder.
......@@ -491,6 +502,12 @@
expressions only
\li
\row
\li M128
\li Error
\li A state cannot have the specified child item
\li
\row
\li M201
\li Hint
......@@ -894,6 +911,8 @@
\li QML code snippets, which specify QML code constructs
\li Nim code snippets, which specify Nim code constructs
\endlist
\section3 Adding and Editing Snippets
......@@ -1036,9 +1055,9 @@
copy the URL of the post on the code pasting service to the
clipboard when you paste a post.
\li Select the \uicontrol {Display Output pane after sending a post} to
display the URL in the \uicontrol {General Messages} output pane
when you paste a post.
\li Select the \uicontrol {Display Output pane after sending a post}
check box to display the URL in the \uicontrol {General Messages}
output pane when you paste a post.
\endlist
......@@ -1240,6 +1259,8 @@
identifiers, type names, or left or right \c const or \c volatile
keywords.
\li Name getter functions.
\endlist
You can use the live preview to see how the options change the indentation.
......@@ -1423,6 +1444,14 @@
\image qtcreator-pointers-references.png "Pointers and References options"
\section1 Naming Getters
To prefer getter names without the string \e get, select the
\uicontrol {Prefer getter names without "get"} check box in the
\uicontrol {Getter and Setter} tab.
\image qtcreator-code-style-getter-setter.png
*/
......@@ -1548,6 +1577,8 @@
\li \uicontrol {Files in File System} recursively searches files
matching the defined file pattern in the selected directory.
\image qtcreator-search-filesystem.png
Select the \uicontrol {Use Git Grep} check box to use Git to
only search tracked files in the Git work tree. To restrict
the search to the HEAD, a tag, a local or remote branch, or
......@@ -2442,7 +2473,7 @@
\list
\li Press \key {Ctrl+K} (\key {Cmd+K} on OS X).
\li Press \key {Ctrl+K} (\key {Cmd+K} on \macos).
\li Select \uicontrol Tools > \uicontrol Locate.
......
......@@ -61,7 +61,7 @@
\endlist
On OS X:
On \macos:
\list
......
......@@ -81,7 +81,7 @@
\section1 Using External Text Editors
You can open files for editing in the default text editor for your system:
Notepad on Windows and vi on Linux and OS X.
Notepad on Windows and vi on Linux and \macos.
To open the file you are currently viewing in an external editor, select
\uicontrol Tools > \uicontrol External > \uicontrol Text >
\uicontrol {Edit with Notepad} or \uicontrol {Edit with vi}, depending on
......@@ -157,7 +157,7 @@
The tool configurations that you add and modify are stored in XML format in
the user configuration folder. For example,
\c {~/config/QtProject/qtcreator/externaltools}
on Linux and OS X and
on Linux and \macos and
\c {C:\Users\username\AppData\Roaming\QtProject\qtcreator\externaltools}
in Windows. To share a configuration with other users, copy an XML
configuration file to the folder.
......
......@@ -200,19 +200,19 @@
\li Ctrl+6
\row
\li Toggle \uicontrol{Issues} pane
\li Alt+1 (Cmd+1 on OS X)
\li Alt+1 (Cmd+1 on \macos)
\row
\li Toggle \uicontrol{Search Results} pane
\li Alt+2 (Cmd+2 on OS X)
\li Alt+2 (Cmd+2 on \macos)
\row
\li Toggle \uicontrol{Application Output} pane
\li Alt+3 (Cmd+3 on OS X)
\li Alt+3 (Cmd+3 on \macos)
\row
\li Toggle \uicontrol{Compile Output} pane
\li Alt+4 (Cmd+4 on OS X)
\li Alt+4 (Cmd+4 on \macos)
\row
\li Toggle other output panes
\li Alt+number (Cmd+number on OS X)
\li Alt+number (Cmd+number on \macos)
Where the number is the number of the output pane.
\row
......@@ -241,7 +241,7 @@
\li Ctrl+Shift+F11
\row
\li Toggle the sidebar
\li Alt+0 (Cmd+0 on OS X)
\li Alt+0 (Cmd+0 on \macos)
\row
\li Undo
\li Ctrl+Z
......@@ -337,11 +337,25 @@
\li Go to block start
\li Ctrl+[
\row
\li Go to block end with selection
\li Ctrl+}
\li Go to block end and select the lines between the current cursor
position and the end of the block
\li Ctrl+Shift+]
\row
\li Go to block start with selection
\li Ctrl+{
\li Go to block start and select the lines between the current
cursor position and the beginning of the block
\li Ctrl+Shift+[
\row
\li Select the current block
The second press extends the selection to the parent block. To
enable this behavior, select \uicontrol Tools >
\uicontrol Options > \uicontrol {Text Editor} >
\uicontrol Behavior >
\uicontrol {Enable smart selection changing}.
\li Ctrl+U
\row
\li Undo the latest smart block selection
\li Ctrl+Alt+Shift+U
\row
\li Move current line down
\li Ctrl+Shift+Down
......@@ -354,11 +368,6 @@
\row
\li Rewrap paragraph
\li Ctrl+E, R
\row
\li Select the current block
The second press extends the selection to the parent block
\li Ctrl+U
\row
\li Enable text wrapping
\li Ctrl+E, Ctrl+W
......@@ -469,6 +478,37 @@
\li Alt+V, n, where n is the number of the user action, from 1 to 9
\endtable
\section3 Emacs Shortcuts
You can specify shortcuts for executing actions in a way that is familiar to
\l{https://www.gnu.org/software/emacs/manual/html_node/emacs/index.html}
{Emacs} editor users. The actions are not bound to any key combinations by
default. The following actions are available:
\list
\li Copy
\li Cut
\li Delete Character
\li Exchange Cursor and Mark
\li Go to File End
\li Go to File Start
\li Go to Line End
\li Go to Line Start
\li Go to Next Character
\li Go to Next Line
\li Go to Next Word
\li Go to Previous Character
\li Go to Previous Line
\li Go to Previous Word
\li Insert Line and Indent
\li Kill Line
\li Kill Word
\li Mark
\li Scroll Half Screen Down
\li Scroll Half Screen Up
\li Yank
\endlist
\section2 Image Viewer Shortcuts
\table
......