Commit 6bbdeec8 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
parents e84647ae fac11973
...@@ -65,9 +65,9 @@ CMake Projects ...@@ -65,9 +65,9 @@ CMake Projects
* Fixed build directory when adding build configurations * Fixed build directory when adding build configurations
(QTCREATORBUG-8425) (QTCREATORBUG-8425)
QBS Projects Qbs Projects
* Implemented initial support for Qt Build Suite (QBS) projects * Implemented initial support for Qt Build Suite (Qbs) projects
* Made Qt Creator itself compilable with QBS * Made Qt Creator itself compilable with Qbs
Generic Projects Generic Projects
* Implemented using MIME types to recognize source files (QTCREATORBUG-5451) * Implemented using MIME types to recognize source files (QTCREATORBUG-5451)
...@@ -84,63 +84,80 @@ Debugging ...@@ -84,63 +84,80 @@ Debugging
types (QByteArray, std::string, char[], char* etc) types (QByteArray, std::string, char[], char* etc)
* Adjusted to GDB 7.5 changes * Adjusted to GDB 7.5 changes
* Removed dependency on QmlJSTools * Removed dependency on QmlJSTools
* Added shortcut to add breakpoint by double click on break view * Implemented adding breakpoints by double-clicking in Breakpoints view
* Made breakpoint markers draggable * Implemented dragging and dropping breakpoint markers
* Added logging of exceptions (QTCREATORBUG-8141) * Added logging of exceptions in the Compile Output pane (QTCREATORBUG-8141)
* Added option to use Intel-style disassembly * Added option to use Intel-style disassembly to debugger GDB options
* Improved color highlighting of locals in memory view * Improved color highlighting of locals in Memory view
* Made string cutoff value configurable * Made string cutoff value configurable
* Put separate string displays in tab widget (QTCREATORBUG-8344) * Put separate string displays in tab widget (QTCREATORBUG-8344)
* Implemented basic value editing for CDB (QTCREATORBUG-8344) * Implemented basic value editing for CDB (QTCREATORBUG-8344)
* Added CDB setting to ignore first-chance exceptions (QTCREATORBUG-8141)
* Implemented support for displaying images in CDB * Implemented support for displaying images in CDB
* Added framework to wrap plain GDB pretty printers for use in Creator * Added framework to wrap plain GDB pretty printers for use in Qt Creator
* Implemented display format changes for multi-selection * Implemented display format changes for multi-selection
(QTCREATORBUG-7577) (QTCREATORBUG-7577)
* Added hook for user specified commands after attaching to target
Analyzer Analyzer
C++ Support C++ Support
* Added GetterSetter quick fix * Added Create Getter and Setter Member Functions refactoring action
* Added Reformat Pointers or References refactoring action
(QTCREATORBUG-6169)
* Introduced formatting options for pointers and references
(QTCREATORBUG-6169)
* Fixed semantic highlighting when multiple editors are visible * Fixed semantic highlighting when multiple editors are visible
* Fixed Find/Rename Macro usage * Fixed Rename Symbol Under Cursor for C++ macros
* Added code completion for instantiation of templates with default argument
* Added C++11 alignof and alignas tokens
* Added support for C++11 brace initializers (QTCREATORBUG-7919 et al)
* Fixed parsing of C++11 noexcept(constant-expression_
* Added support for C++11 ref-qualifiers in function declarators: void
foo() const &; void bar() && and related pointer-to-member declarators
* Added parsing of alias declarations: using Foo = std::vector<int>::iterator
* Added support for C++11 enum classes and opaque enum declarations
* Fixed use of >> in C++11 template arguments
* Added hook for user specified commands after attaching to target
* Added CDB setting to ignore first-chance exceptions (QTCREATORBUG-8141)
* Improved handling of lambda captures (QTCREATORBUG-7968,
QTCREATORBUG-7949)
* Improved code completion for Qt containers (QTCREATORBUG-8228)
* Added support for -stdlib=.. variants * Added support for -stdlib=.. variants
* Fixed code completion in nested classes when enclosing class is template
* Fixed code completion for operator-> (QTCREATORBUG-629)
* Fixed code completion when casting inside parentheses
(QTCREATORBUG-8368)
* Switched to C++11 parsing in cases of doubt (CMake/Autotools/Generic)
* Fixed constructor parsing in cases with unnamed parameters * Fixed constructor parsing in cases with unnamed parameters
* Introduced formatting options for pointers and references * Code completion
(QTCREATORBUG-6169) * Added code completion for instantiation of templates with default
argument
* Improved code completion for Qt containers (QTCREATORBUG-8228)
* Fixed code completion for classes in class templates
* Fixed code completion for operator-> (QTCREATORBUG-629)
* Fixed code completion when casting inside parentheses (QTCREATORBUG-8368)
* C++11 support
* Added C++11 alignof and alignas tokens
* Added support for C++11 brace initializers (QTCREATORBUG-7919 et al)
* Added support for C++11 ref-qualifiers in function declarators: void
foo() const &; void bar() && and related pointer-to-member declarators
* Added support for C++11 enum classes and opaque enum declarations
* Fixed use of >> in C++11 template arguments
* Switched to C++11 parsing in cases of doubt (CMake/Autotools/Generic)
* Fixed parsing of C++11 noexcept(constant-expression)
* Added parsing of alias declarations:
using Foo = std::vector<int>::iterator
* Improved handling of lambda captures (QTCREATORBUG-7968,
QTCREATORBUG-7949)
QML/JS Support QML/JS Support
* Improved JS Console * Improved JS Console
* Fixed indentation in if condition and lambda expressions * Fixed indentation in if condition and lambda expressions
(QTCREATORBUG-7243) (QTCREATORBUG-7243)
* Added persistent trie to store imports * Made sure default kit for new Qt Quick 2 UI project is Qt 5 based
(QTCREATORBUG-8424)
* Added detection of import type from main file to invoke QML Viewer when
previewing QML documents that import Qt Quick 1 (QTCREATORBUG-8358)
* Corrected handling of Qt Quick 2 only features
(QTCREATORBUG-8750, QTCREATORBUG-8624, QTCREATORBUG-8584,
QTCREATORBUG-8583, QTCREATORBUG-8429)
* Added import completion in editor
* Improved speed of QML/JS Editor for large files (QTCREATORBUG-8673)
* Made contextual help more robust (QTCREATORBUG-3169)
* Improved initial kit selection (QTCREATORBUG-8424) * Improved initial kit selection (QTCREATORBUG-8424)
* Added detection of import type from main file (QTCREATORBUG-8358) * Added detection of import type from main file (QTCREATORBUG-8358)
* Fixed QmlProjectManager (QTCREATORBUG-8679, QTCREATORBUG-8680) * Hid properties starting with "__" in auto-completion
* Changed paser to enforce strict mode for javascript within a QML file
GLSL Support GLSL Support
Help Help
* Used zoom factor instead of text size multiplier (QTCREATORBUG-7199) * Used zoom factor instead of text size multiplier to make also images
* Corrected setup of HelpNetworkReply for offline resources smaller when zooming in (QTCREATORBUG-7199)
* Corrected setup of HelpNetworkReply for offline resources to display
standard help icons correctly when viewing documents in Help mode
(QTCREATORBUG-8211) (QTCREATORBUG-8211)
Qt Designer Qt Designer
...@@ -153,27 +170,25 @@ Qt Quick Designer ...@@ -153,27 +170,25 @@ Qt Quick Designer
* Added manual test files for Qt Quick 2 * Added manual test files for Qt Quick 2
* Added QQuickItem to New Class wizard * Added QQuickItem to New Class wizard
Version control plugins Version Control Systems
* Git
Git * Dropped support for Git versions earlier than 1.7.2
* Introduced MergeTool support * Introduced Merge Tool support
* Added timeout to the gerrit query process * Added timeout to the Gerrit query process
* Added support for merge status * Added support for merge status
* Fixed log encoding * Fixed log encoding
* Reorganized menu (QTCREATORBUG-8363) * Reorganized Git menu (QTCREATORBUG-8363)
* Added gitk launch for current file (QTCREATORBUG-8327) * Added Gitk launch for current file (QTCREATORBUG-8327)
* Added branch name validation (QTCREATORBUG-8370) * Added branch name validation (QTCREATORBUG-8370)
* Added Merge and Rebase (QTCREATORBUG-8367) * Added Merge and Rebase for branches in local repository
* Added auto stash when switching branches (QTCREATORBUG-8417) (QTCREATORBUG-8367)
* Added Soft Reset to Reset dialog * Added automatic stashing when switching branches (QTCREATORBUG-8417)
* Added context actions for cherry-pick and revert * Added Soft Reset to Reset dialog
* Implemented refreshing file list on commit page every time * Added Cherry-Pick Commit and Revert Single Commit in local repository
it becomes visible (QTCREATORBUG-5645) * Implemented refreshing file list in Git Commit pane every time
it is displayed (QTCREATORBUG-5645)
SVN * Promoted the ClearCase plugin from an experimental plugin to a
standard plugin
ClearCase
* Marked the plugin as non-experimental
FakeVim FakeVim
* Created new suite of auto tests * Created new suite of auto tests
...@@ -203,9 +218,12 @@ WelcomePage: ...@@ -203,9 +218,12 @@ WelcomePage:
Platform Specific Platform Specific
Mac Mac
* Replaced xterm with Terminal.app as default terminal (QTCREATORBUG-6371)
Linux Linux
* Added crash handler providing a backtrace for debug builds * Added crash handler providing a backtrace for debug builds
* Added support for terminal emulators that share a unique process
(QTCREATORBUG-1633)
Windows Windows
* Improved UI to handle x64 and amd64 etc toolchains * Improved UI to handle x64 and amd64 etc toolchains
......
...@@ -34,6 +34,12 @@ ...@@ -34,6 +34,12 @@
with the Android device type, the tool chain, and the Qt version for Android, with the Android device type, the tool chain, and the Qt version for Android,
to build and run applications on Android devices. to build and run applications on Android devices.
The Android Debug Bridge (adb) command line tool is integrated to \QC to
enable you to deploy applications to connected Android devices, to run
the applications on them, and to read logs from them. It includes a client
and server that run on the development host and a daemon that runs on the
emulator or device.
\section1 Requirements \section1 Requirements
To use \QC to develop Qt applications for Android, you need the following: To use \QC to develop Qt applications for Android, you need the following:
...@@ -112,6 +118,10 @@ ...@@ -112,6 +118,10 @@
\section1 Debugging on Android Devices \section1 Debugging on Android Devices
\QC is integrated with the GDB and GDB server that are delivered with the
Necessitas SDK. It provides GDB with Python support that enables \QC to
display custom Qt types, such as QString, QObject, and so on.
Android devices support debugging multi-thread applications in version Android devices support debugging multi-thread applications in version
2.2.1 and later. If you use AVD, select Android 2.3, or later. For more 2.2.1 and later. If you use AVD, select Android 2.3, or later. For more
information, see the Android documentation. information, see the Android documentation.
......
...@@ -502,34 +502,80 @@ ...@@ -502,34 +502,80 @@
The interruption of a program by a breakpoint can be restricted with The interruption of a program by a breakpoint can be restricted with
certain conditions. certain conditions.
To set a breakpoint at a particular line you want the program to stop, You can set and delete breakpoints before the program starts running or
click the left margin or press \key F9 (\key F8 for Mac OS X). while it is running under the debugger's control. Breakpoints are saved
together with a session.
\section2 Adding Breakpoints
To add breakpoints:
\list 1
\li Add a new breakpoint in one of the following ways:
\list
\li In the code editor, click the left margin or press \key F9
(\key F8 for Mac OS X) at a particular line you want the
program to stop.
\li In the \gui Breakpoints view, double-click in the empty
part of the view.
\li In the \gui Breakpoints view, select \gui {Add Breakpoint}
in the context menu.
\endlist
\li In the \gui {Breakpoint type} field, select the location in the
program code where you want the program to stop. The other options
to specify depend on the selected location.
To set breakpoints, select \gui {Add Breakpoint} in \image qtcreator-add-breakpoint.png "Add Breakpoints" dialog
the context menu in the \gui Breakpoints view.
\image qtcreator-add-breakpoint.png "Add Breakpoints" dialog \li In the \gui Condition field, set the condition to be evaluated
before stopping at the breakpoint if the condition evaluates as
true.
\note You can remove a breakpoint: \li In the \gui Ignore field, specify the number of times that the
breakpoint is ignored before the program stops.
\li In the \gui Commands field, specify the commands to execute when
the program stops; one command on a line. GDB executes the commands
in the order in which they are specified.
\endlist
For more information on breakpoints, see
\l{http://sourceware.org/gdb/onlinedocs/gdb/Breakpoints.html#Breakpoints}
{Breakpoints, Watchpoints, and Catchpoints} in GDB documentation.
\section2 Moving Breakpoints
To move the breakpoint, drag and drop a breakpoint marker to another line.
\section2 Deleting Breakpoints
To delete breakpoints:
\list \list
\li By clicking the breakpoint marker in the text editor. \li Click the breakpoint marker in the text editor.
\li By selecting the breakpoint in the breakpoint view and pressing \li Select the breakpoint in the \gui Breakpoints view and press
\key{Delete}. \key{Delete}.
\li By selecting \gui{Delete Breakpoint} from the context \li Select \gui{Delete Breakpoint} in the context menu in the
menu in the \gui Breakpoints view. \gui Breakpoints view.
\endlist \endlist
You can set and delete breakpoints before the program starts running or
while it is running under the debugger's control. Breakpoints are saved
together with a session.
\section2 Setting Data Breakpoints \section2 Setting Data Breakpoints
A \e {data breakpoint} stops the program when data is read or written at the
specified address.
To set a data breakpoint at an address: To set a data breakpoint at an address:
\list 1 \list 1
...@@ -1281,8 +1327,10 @@ ...@@ -1281,8 +1327,10 @@
However, the usefulness of this security measure seems dubious, However, the usefulness of this security measure seems dubious,
because this feature can be easily disabled. With root permissions, you can because this feature can be easily disabled. With root permissions, you can
disable the feature immediately by writing \c{0} into disable the feature temporarily by writing \c{0} into
\c{/proc/sys/kernel/yama/ptrace_scope}. Even if you do not have elevated \c{/proc/sys/kernel/yama/ptrace_scope} or permanently by changing
the value in \c{/etc/sysctl.d/10-ptrace.conf}.
Even if you do not have elevated
permissions, you can disable the feature later by adding a library that permissions, you can disable the feature later by adding a library that
calls \c{prctl(0x59616d61, getppid(), 0, 0, 0);}, such as the one in calls \c{prctl(0x59616d61, getppid(), 0, 0, 0);}, such as the one in
\c{$QTCREATORDIR/lib/libptracepreload.so} to the LD_PRELOAD environment. \c{$QTCREATORDIR/lib/libptracepreload.so} to the LD_PRELOAD environment.
......
...@@ -79,6 +79,10 @@ ...@@ -79,6 +79,10 @@
\li -client \li -client
\li Attempt to connect to an already running instance of \QC. \li Attempt to connect to an already running instance of \QC.
\row
\li -load <plugin>
\li Load the specified plugin.
\row \row
\li -noload <plugin> \li -noload <plugin>
\li Do not load the specified plugin. \li Do not load the specified plugin.
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
\row \row
\li ClearCase \li ClearCase
\li \l{http://www-01.ibm.com/software/awdtools/clearcase/} \li \l{http://www-01.ibm.com/software/awdtools/clearcase/}
\li Experimental plugin in \QC 2.6 \li \QC 2.6 and later
\row \row
\li CVS \li CVS
\li \l{http://www.cvshome.org} \li \l{http://www.cvshome.org}
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
\row \row
\li Git \li Git
\li \l{http://git-scm.com/} \li \l{http://git-scm.com/}
\li \li Git version 1.7.2, or later
\row \row
\li Mercurial \li Mercurial
\li \l{http://mercurial.selenic.com/} \li \l{http://mercurial.selenic.com/}
...@@ -293,29 +293,17 @@ ...@@ -293,29 +293,17 @@
Bazaar is a free version control system sponsored by Canonical. Bazaar is a free version control system sponsored by Canonical.
The \gui Bazaar submenu contains the following additional items: In addition to the standard version control system functions, you can
select \gui Tools > \gui Bazaar > \gui Pull to turn the branch into a
\table mirror of another branch. To update a mirror of the branch, select
\header \gui Push.
\li Menu Item
\li Description
\row
\li \gui{Pull}
\li Turn the branch into a mirror of another branch.
\row
\li \gui{Push}
\li Update a mirror of the branch.
\endtable
\section2 Using Additional ClearCase Functions \section2 Using Additional ClearCase Functions
IBM Rational ClearCase is a version control, workspace management, parallel IBM Rational ClearCase is a version control, workspace management, parallel
development support, and build automation solution developed by IBM. The development support, and build automation solution developed by IBM. The
ClearCase client plugin is an experimental plugin that you can enable by ClearCase client plugin is available on Linux and Windows for accessing a
selecting \gui Help > \gui {About Plugins} > \gui {Version Control} > ClearCase server.
\gui ClearCase. The ClearCase client plugin is available on Linux and
Windows for accessing a ClearCase server.
The \gui ClearCase submenu contains the following additional items: The \gui ClearCase submenu contains the following additional items:
...@@ -350,20 +338,9 @@ ...@@ -350,20 +338,9 @@
CVS is an open source version control system. CVS is an open source version control system.
The \gui CVS submenu contains the following additional items: In addition to the standard version control system functions, you can
select \gui Tools > \gui CVS > \gui Edit to open a file for editing.
\table To discard the changes that you made in a file, select \gui Unedit.
\header
\li Menu Item
\li Description
\row
\li \gui{Edit}
\li Open a file for editing.
\row
\li \gui{Unedit}
\li Discard the changes that you made in a file.
\endtable
\section2 Using Additional Git Functions \section2 Using Additional Git Functions
...@@ -623,15 +600,8 @@ ...@@ -623,15 +600,8 @@
Subversion is an open source version control system. Subversion is an open source version control system.
The \gui Subversion submenu contains the following additional items: In addition to the standard version control system functions, you can
select \gui Tools > \gui Subversion > \gui Describe to display commit log
\table messages for a revision.
\header
\li Menu Item
\li Description