(cherry picked from commit 33bdf429)

(cherry picked from commit 1324a1c6)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/gdbengine.h

(cherry picked from commit bf077800)

Conflicts:

	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/debugger/gdb/gdboptionspage.ui

(cherry picked from commit 8c52f572)

(cherry picked from commit 02e90fd7)

Conflicts:

	src/plugins/debugger/watchhandler.cpp

(cherry picked from commit a5c5cfc4)

Conflicts:

	src/plugins/debugger/debuggerplugin.cpp

As it causes dashed lists to be formatted as
- i1
  - i2
Just do paragraph formatting.

Task-number: QTCREATORBUG-538
Initial-patch-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit 2986ccaf)

Wasn't using a space to separate the closing angular brackets.

Task-number: QTCREATORBUG-547
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

Task-number: QTCREATORBUG-534
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

In this way all tr calls are done after translations are loaded.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@trolltech.com>
Task-number: QTCREATORBUG-470

(cherry picked from commit a8667254)

Fixes: QTCREATORBUG-483
(cherry picked from commit 8929bb27)

Merge-request: 90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

... using fromLocal8Bit instead of fromLatin1.
of course the localized messages pose a "challenge" for the various
workarounds which parse them ...

Task-number: QTCREATORBUG-504

__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places

Reviewed-By: Roberto Raggi
(cherry picked from commit 5832c6b5)

Fixes some highlight errors in code using the win32 API.

Reviewed-By: Roberto Raggi
(cherry picked from commit 771246a5)

Remember the read-only state so that it can be taken into account when
changing the enabled state of the erase background button.

This reverts commit cdf2f70c.

This new feature didn't belong in 1.3. It will remain on master.

Both rename symbol and stop running had Ctrl+Shift+R as default
shortcut, making it impossible to do either when an application was
running and the focus was in the text editor.

Fixing various problems with breakpoints and opened files caused by CDB
returning lower-case file names.
Task-number: QTCREATORBUG-438
Reviewed-by: hjk <qtc-committer@nokia.com>
Acked-by: mariusSO <qt-info@nokia.com>

Task-number: QTCREATORBUG-438

Reviewed-by: hjk
Task-number: QTCREATORBUG-399

Task-number: QTCREATORBUG-463
Reviewed-by: dt

For folder nodes.

Task-number: QTCREATORBUG-374
Reviewed-by: Thorbjorn

Maybe we'll need to add an option to toggle that on, or tweak the
blending (50:50 at the moment)

Reviewed-by: dt

Before, the selection was required to span multiple lines. Now, any
selection will trigger the line indenting functionality of
Tab/Shift+Tab. This should lead to less surprises.

Also, Shift+Tab will now always unindent the current line, even if there
is no selection, since there is nothing else sensible for this shortcut
to do.

Task-number: QTCREATORBUG-414
Reviewed-by: mae

Task-number: QTCREATORBUG-384
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

For example std::string, which is a typedef of std::basic_string.

Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

Several special cases that are handled by the CPPEditor did not take
into account code that was using tab characters.

Task-number: QTCREATORBUG-292
Reviewed-by: Roberto Raggi

patch by Robert de Vries

When auto-indent is turned off, Qt Creator uses a simplistic approach of
copying the indentation string from the previous line. This was broken
when the cursor was positioned inside the indentation, since this caused
part of the indentation to go to the next line, which was then prepended
with the copied indentation, in effect increasing the indentation for
each new line.

The solution here was to copy the indentation from the previous block
only after inserting the new block, which causes the indentation of the
previous line to be cut off by exactly the right amount to keep the
indentation constant.

Task-number: QTCREATORBUG-396
Reviewed-by: mae

Reviewed-by: Roberto Raggi