Version bump

Change-Id: I6e79c827e777da29421933e9120c177687d4f783
Refactoring of QMLS suites

- moved common parts to shared script

Change-Id: I25ac888d7103ee36edff9ead502fa432a5dc2937
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Squish: Run tst_simple_debug with Qt 4.7

Change-Id: Ibc330a7ca3e1c378c78cf8eb4c559c2a99c3d8d0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
debugger: do not hide errors thrown in typedef'ed items

Change-Id: I86539bb08a43f59c53f80b0eb83db1f7cda5fe1b
Reviewed-by: hjk <qthjk@ovi.com>
debugger: implement gdb pretty printer for std::{map,set}::iterator

Change-Id: Idbe63b40f88d901fa762dd0ecbda2b5aa5d59642
Reviewed-by: hjk <qthjk@ovi.com>
Debugger: Fix compiler warnings about unused variables

Change-Id: I82f76dddb8b294f9a10dfa0f2ab5030c6f8edff3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Merge remote-tracking branch 'origin/2.5'

Conflicts:
	qtcreator.pri
	qtcreator.qbp

Change-Id: Iacfb9cc0c927c9d6291c60624f9e6fd2ce5877cb
WatchHandler: Add isInspect()

Change-Id: I237f77554a06bf7c139a8ae5cfef79c6fb4c8507
Reviewed-by: hjk <qthjk@ovi.com>
Debugger: Remove 'Clear Code Model' context menu action

The use case of this action (introduced in 25ee70bb24bec) is unclear.

Change-Id: I5188d5c8c9b06c5e2663e2ddc4c89ef1e670d891
Reviewed-by: hjk <qthjk@ovi.com>
cppeditor: guess file type from -*- C++ -*- comments

Change-Id: I33a0c4e60701f2d859b52063b7aaf4c1ebfdc1ea
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Make Qt Creator documentation link to online docs

Change-Id: I3f843831242929bd3e8427a56c8269c62c1812c1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
SVN: Fix project status command when no document open

The SVN project status command is using currentFileTopLevel() for the
working directory when it should be using currentProjectTopLevel().
If no document is open, currentFileTopLevel() will return an empty
string which means the current working directory of Qt Creator is used.

Change-Id: I848b1adf7166836c5d15e88796af77f8700a43f2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Add a CurrentProject::BuildPath variable.

Task-number: QTCREATORBUG-4885

Change-Id: I9098f42336b487626d181a677ac92db2382c3cfe
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Adapt coding rules for file names to point to the FileName class.

Change-Id: Ic28c3b0647a353f50c092782ae689ed6173b067b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Debugger:Apply Changes on Save modified for unsync. changes.

The user is given an option to reload the QML app if he has done
any unsynchronizable change. If the user opts to reload the QML,
Inspector informs the qtdevlarative to do so.

Change-Id: Iefc044e64380e64415630b051a60d6fe9fedfe04
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Debugger: Bugfix for Reloading Qml

Option for reloading the Qml files in case of unsynchronizable
changes is not provided for Qt versions less than 5.0.

Change-Id: I4bb942ab9d5c699fa8569f81502ba86bccfe1bbd
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Core: Add "canceled" signal to class FutureProgress.

This allows clients to get notified that the operation has been canceled
by the user without the need to create an additional QFutureWatcher
themselves.

Change-Id: I928f87eef98ce762d77dcc6962c082fe49f38f6e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Debugger: Apply on Save only when Engine client is connected

Creation of the Text previews are done only when the engine client
is connected and they are deleted once the engine client changes
from the connected state.

Change-Id: I325d0d1a281b9e8fab4ddf9ff8ea4f5e60d4ac2a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Remove some objects from the objects pool. Fixes race condition.

Since the central widget would access the local help manager in
its destructor, we need to handle deletion of the objects ourself.
The object pool would release it to early, thus we could never
write some settings back into the collection file.

Change-Id: Ib4e003214d9d0b32bee3922dd23d27624b5d110e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Qt versions/qmake dialog: Join filter list correctly.

Do not add a trailing blank.

Change-Id: I0b187345415d96508be495860c530bd2f0c292c6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>