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

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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment