debugger: call shutdownEngine, not shutdownInferior on EngineRunFailed
(cherry picked from commit 57f7616286f4a98e3af2b6908211f47416270992)

debugger: fix EngineSetupFailed path

Task-number: QTCREATORBUG-2837
(cherry picked from commit 2efdeb5cd00ca012642d3b6944b04a04326c3f00)

QmlJS: Fix member completion at the end of a nested object definition.

The parser's error recovery generates three nested object definitions
for code like
Item { Item { font } }
where the innermost definition corresponds to 'font }' and has an empty
lbrace token.

If we create a Range for this recovered definition, code completion will
fail for 'font.'.

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

qmldump: Ensure path and environment are taken from the same Qt version.

Fixes f1fb0bddb11d69355784953a6cc0364f9fa25d3e.

Reviewed-by: Kai Koehne
(cherry picked from commit 528999d54972306238e1623cfbc4887ca635c253)

Debugger/JS Code model: Set environment for QML tools correctly.

Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-2883
(cherry picked from commit f1fb0bddb11d69355784953a6cc0364f9fa25d3e)

Fix Creator crash on SSH connection loss.

QTCREATORBUG-2890

Reviewed-by: dt

Update Japanese 2.1 translations.

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

Updated Russian translation

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

remove execute bit ... again

update list of up-to-date translations

update german translation

simplify #include statement

helps lupdate

exclude dead/irrelevant sources from string collection

kill dead source string

Fixed double word in message

Adjusting the source in all affected translations as well.

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

Updated Russian translation

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

Debugger: Suppress inconsistencies in gdb binary settings.

caused by the merging of global settings.
Terminate list of binaries by an empty element to prevent
accidental reading of consecutive keys.
Add Linux-ICC to list of toolchains for gdb.

Acked-by: hjk
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Task-number: QTCREATORBUG-2848

L10N: Update Japanese 2.1 translation.

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

Ukrainian translation updated

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

DebugHelpers: Remove incorrect warning about qmldump requiring 4.7.1

qmldump works fine with 4.7.0 (as long as private headers are available).

Reviewed-by: ckamm

DebugHelpers: Always update icons after recompile

The information about a Qt version (including the debugging helper paths)
is cached. Invalidate the cache after all the debugging helpers have
been built, such that the following icon updates actually get the latest
information.

We do invalidate the cache already before the compilation of
the debugging helpers have started, but QmlDumperTool::canBuild
then triggers a refill of the cache, at a time where the qmldump
executable has not yet been created.

Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-2807

Fix double listing of files

Reviewed-By: con
Task-Nr: QTCREATORBUG-2729

Qt4ProjectManager: Compress the folderChanged via a small timer

Reviewed-By: hunger

Optimize which folders we recursively enumerate

Reviewed-By: hunger

French translation updated for Creator 2.1

Contributed by the team at developpez.com.

This is the squashed result of a team effort. Authors are:

Guillaume Belz <guillaume.belz@free.fr>
Cédric Bonnier <myzu69@gmail.com>
Jonathan Courtois <jonathan.courtois@gmail.com>
Thibaut Cuvelier <dourouc05@gmail.com>
Pierre-Nicolas Rigal <qt-contrib@p-n-r.com>

For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

See also: http://qt.developpez.com/

Merge-request: 206
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-by: ossi

C++ indenter: Ensure indent and padding are non-negative.

Reviewed-by: Roberto Raggi

QmlDesigner.model: crash fix

Check if the node is really a PropertyChange

Reviewed-by: Marco Bubke

QmlDesigner.NodeInstances: crash fix

This patch avoids a recursion.

Reviewed-by: Marco Bubke

QmlDesigner: delete Row/Column and Grid specifics

The default panes  are good enough and work fine

Reviewed-by: Kai Koehne

Another shortcut conflict less on Mac OS.

Reviewed-by: Joerg Bornemann

Doc - update screen shot

Task-number: QTCREATORBUG-2530

fix external doc references

Doc - Qt Quick Designer UI in more detail

Reviewed-by: Carsten Owerfeldt

Debugger: Fix compilation with VS2005.

Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>

Add our own description file to show all possible QML examples.

Reviewed-By: con

Debugger/Windows: Do not attach to process being debugged.

Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Task-number: QTCREATORBUG-2086

QmlOutline: Don't use LookupContext due to performance issues

Creating a LookupContext can be sloooow for large projects. We create
one instance for every update in the Outline to get the right icons.

Take a shortcut here and just use the element name directly, ignoring
packages names etc.

This is a hot fix for 2.1, a following patch will change the Icon
retrieval API accordingly.

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

Debugger: Avoid opening of editor in shutdown phase.

Remove duplicate code. Introduce ScopedPointer for
location mark. Check shutdown phase when opening editors.

Reviewed-by: con
Task-number: QTCREATORBUG-2833

Debugger: Suppress Auto-Dereferencing of pointers for char* types.

Sequence of processing changed since 2.0.1.

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

Debugger: Disable gdb post-mortem debugging on Windows.

As it is not able to do the event-handshake required.

Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-2086

Debugger: Avoid crashes when no C++-engine is available.

Check for valid runcontrols in various places and initialize
m_engine correcly. In the case of QML-Debugging, handle
NoEngineType.

Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-2086

update qt help index to 4.7.1

the file is "only" one meg after compression, so it isn't as bad as it
looks. and it is sorted now, so further updates should be somewhat less
wasteful.

Reviewed-by: danimo

fix one more raw data leak

again, qregexp was putting our raw string into its cache - this time
hidden behind a qdir::entrylist().

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

update changelog

use http_proxy variable for proxy detection on linux

Reviewed-by: con

Stop navigationwidget from going haywire

Stop navigationwidget from going haywire when faced with old
configuration data. This issue could lead to different effects:
 * A crash
 * Creator not being able to exit anymore
 * The sidebar being messed up

Task-number: QTCREATORBUG-2780
Reviewed-by: con

fix warnings

Reviewed-by: Marco Bubke

Debugger: Catch exception if thread name cannot be determined.

As reported on mailing list.

Reviewed-by: hjk
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>

QmlJsEditor: fixes warning

Reviewed-by: Lasse Holmstedt

QuickToolBar: reduce usage of lookup context

Getting the lookup context is expensive. So it is now done only
on user interaction.

Reviewed-by: Roberto Raggi

QuickToolBar: do not show QuickToolBar as tooltip anymore.

Most users perceived this as a bug and found it annoying in
practice. So this feature gets removed.

Reviewed-by: Roberto Raggi

QmlDesigner: support for QtQuick 1.0

This add preliminary support for import QtQuick 1.0
The RewriterView does type conversion from QtQuick to Qt
so Bauhaus does not have to deal with ambiguities.

Reviewed-by: Marco Bubke

L10n: Final German 2.1 translation.

expand working directory before looking for a command in it

Reviewed-by: hunger

Fix potential crash when closing settings dialog.

We accessed the m_applied member after the dialog already was deleted.

Task-number: QTCREATORBUG-2844
Reviewed-by: Friedemann Kleint

Valgrind fix of leak in MaemoSettingsWidget.

Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Valgrind fixes.

In Debugger and WelcomePageWidget.

Reviewed-by: Daniel Molkentin <daniel.molkentin@trolltech.com>

Maemo: Fix debugger race condition.

"gdbserver started" does not necessarily mean "gdbserver has opened its port".

Reviewed-by: Tobias Hunger

Fix previous fakevim fix (make slot actually a slot)

Reviewed-by: Friedemann Kleint

Wizards: Format UI-form class code correctly.

Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-2779

Prevent crash when closing Qt Creator while cdb session is running.

The debugger plugin opens an editor in this case, leading to fakevim and
cppeditor crashing.
This commit doesn't fix the problem's source, but adds safeguards that
are sensible anyhow: FakeVim should not register with editors during
shutdown, and CppEditor should not unconditionally assume an existing
editor manager in the destructor.

Reviewed-by: Friedemann Kleint

Don't crash while reporting a configuration error (S60 debugging)

Task-number: QTCREATORBUG-2828
Reviewed-by: Robert Loehning
Reviewed-by: Friedemann Kleint

Debugger: Do not pass -client for Windows-post-mortem debugging.

Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Task-number: QTCREATORBUG-2827

QmlJS: Fix a performance problem.

In order to determine all components that instantiate a given component,
Bind::usesQmlPrototype was called on each document in the snapshot.
That, in turn, had to iterate over all object definitions inside the
document, resolving their prototype references.

All in all, it lead to a very large amount of fairly expensive lookups
that were slowing down Creator considerably.

Reviewed-by: Erik Verbruggen

QmlOutline: Fix reordering of array elements

Make sure that a comma is added when inserting array elements
into the array.

Task-number: QTCREATORBUG-2796
Reviewed-by: Erik Verbruggen

DebuggerEngine:  fixed race condition at qml engine startup
Reviewed by: hjk

QmlDesiger:  fixed format for the easing parameters in the easing dialog
Reviewed by: Thomas Hartmann

Mobile wizards: Add hint for Qt Mobility.

Reviewed-by: dt

Debugger: Fix attaching via QtSingleApplication.

In case qtcdebugger sends a command to an already running
instance of Qt Creator (Windows).

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

QmlJS: Fix false-positive errors reported for ListElement, Connections.

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

Debugger: Fix expanding objects for Symbian (gdb 6.8).

Handle older Python bindings as well.

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

C++ indenter: Add autotest for C++0x 'for' statement.

Reviewed-by: trustme

Doc: Maemo development is supported on all dev envs

Reviewed-by: Maurice Kalinowski

Doc: update screenshots

Task-number: QTCREATORBUG-2771

QmlJS: Fix crash in debugger tooltips

Check that the node under cursor is indeed a UiObjectMember

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-2760

QmlJSDebugger: Show filename/line number also for enabled breakpoints

Hitting a breakpoint automatically acknowledges it, and from then on
bpFileName, bpLineNumber are used in the Breakpoints pane instead of
fileName, lineNumber.

Task-number: QTCREATORBUG-2759
Reviewed-by: Christiaan Janssen

Fixed jumping internally-defined symbols ("<configuration>" file).

Reviewed-by: Christian Kamm

Updated the QML/JS front-end.

Reviewed-by: Christian Kamm

Fixes: Wizard page that allows adding to pro file selected non-optimal file

The heuristics depended on pro files appearing before pri files in the
list, but now the list is alphabetically sorted.
Leading to deployment.pri being selected by default for mobile projects.

Task-number: QTCREATORBUG-2792
Reviewed-by: Friedemann Kleint

C++ indenter: Fix indentation after namespace aliases.

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

Open files from search result list with right encoding, even on Windows.

Didn't work if a project specific encoding was set.

Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning

Adapt default debug shortcuts on Mac.

Task-number: QTCREATORBUG-1956
Reviewed-by: Joerg Bornemann

QmlJS: Fix newly parsed document not being added to the snapshot copy.

This was the root cause of several issues with scoping and import
resolution. For instance, finding the components that instantiate a
component that's opened in the editor failed; leading to code
completion missing valid entries.

Reviewed-by: Erik Verbruggen
Reviewed-by: Roberto Raggi

Wizards: Correct tab stops of Test Wizard Page.

Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
Task-number: QTCREATORBUG-2776

Wizards: Remove settings buttons.

As they do not look nice in the layouts and several
options pages are involved in the case of the form
class wizard.

Reviewed-by: con
Task-number: QTCREATORBUG-2778

QmlJS: Fix completion for enums on the global Qt object.

Reviewed-by: Erik Verbruggen

Add the path to the installed Qt Frameworks on Mac.

Otherwise all the Qt headers might not be found at all.

Task-number: QTCREATORBUG-1377
Reviewed-by: Tobias Hunger
Reviewed-by: Erik Verbruggen

Yet another missing utf8 encoding for file search.

Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning

Maemo: Don't monopolize the debian directory.

Using a debian directory in the project root directory might interfere
with non-MADDE configurations.
We therefore introduce an extra directory qtc_packaging, where we can
safely put our stuff. In the future, this should also contain
non-Fremantle (and possibly non-Debian) configurations.

Reviewed-by: Oswald Buddenhagen

QmlDesigner: fixes property editor

Recent changes in 4.7 rendered the original qml code invalid

Task-number: QTCREATORBUG-2765
Reviewed-by: Marco Bubke

Fixed find scope

There was an off-by-one error for the normal find scope.
Improved look by ignoring the left side.

Debugger: Fix Python-based dumping of std::string.

Sometimes, std::string is seen instead of std::basic_string<>.

Reviewed-by: hjk
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Task-number: QTCREATORBUG-2662

Debugger: Fix slashes in breakpoint display.

Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>

Fixed the link style in the application output window.

Reviewed-by: Tobias Hunger

Fixed an invalidly named method.

QML: use Qt4 output formatter to get links in errors to work.

Reviewed-by: Tobias Hunger

Doc - update version control system section

Reviewed-by: Tobias Hunger

Doc - Debugging QML and Java Script

Reviewed-by: Kai Koehne
Reviewed-by: Christiaan Janssen

Doc - fix links to 4.7 docs

Doc - remove hyphens from sub...