Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: If7001963bc11f2fa01f058c903ee014f6acb0c04
Reviewed-on: http://codereview.qt-project.org/5102


Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Make sure it is always emitted if the parseInProgress state changes

Change-Id: I0e8dc6df5c68f14bd51885c078e909be10af8efa
Task-Nr: QTCREATORBUG-6057
Reviewed-on: http://codereview.qt-project.org/4657


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Change-Id: I6c27fe4ca0201cbbe929821d4408d61a068e8982
Reviewed-on: http://codereview.qt-project.org/4968


Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Change-Id: Ia8ff967badea1ca499da03651b3e7e0c2f78fd7b
Reviewed-on: http://codereview.qt-project.org/4951


Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Change-Id: I835b42cc1d16df43200579cc1bf85422784bf79d
Reviewed-on: http://codereview.qt-project.org/5085


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Ib0d8a7bf7ad741f12c179b6215df44ed04f82534
Reviewed-on: http://codereview.qt-project.org/5079


Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Task-number: QTCREATORBUG-6123
Change-Id: Ide0460317561c116fdaf12f400cc8b12f5c40ca0
Reviewed-on: http://codereview.qt-project.org/5078


Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: I1a6c6b2fe6fcafda75e30e96995baa5194461846
Reviewed-on: http://codereview.qt-project.org/5022


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

This is for the benefit of people using e.g. meego tool chains to
build their own Qt versions and work with them in the desktop
target.

All the specialized targets filter the tool chains again, so
this should be ok to do.

Task-number: QTCREATORBUG-5960
Change-Id: If872d8a6ba75985f23f36646bb89e1651ce82f80
Reviewed-on: http://codereview.qt-project.org/4521


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

The user can request Javascript break on event. The user can provide
this info in the Breakpoints Window and provide the slot which will
be called when the event occurs. For example: specify "onTriggered" if
you need to break on Timer triggered event.

Change-Id: If936d7402f5978a182132fdcca75515588364e16
Reviewed-on: http://codereview.qt-project.org/4758


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I67b156ab6f44ccdfe199b4928f6f62129b05b0b7
Reviewed-on: http://codereview.qt-project.org/5074


Reviewed-by: hjk <qthjk@ovi.com>

This is not a final solution.

Change-Id: I19e7a99e1b056704864d27855197678a0d3fd10b
Reviewed-on: http://codereview.qt-project.org/5073


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I32341ddc529cc20f5c7d1f907d88a05f5e062cb0
Reviewed-on: http://codereview.qt-project.org/5072


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I2dbf049eb97842ed6b72e05f8d7b1e91d08996d1
Reviewed-on: http://codereview.qt-project.org/5021


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Change-Id: Ie9331d233894e49cf86605819687eeef765272df
Reviewed-on: http://codereview.qt-project.org/5067


Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Task-number: QTCREATORBUG-6117

Change-Id: I53bf05340ee20596f4a2a5cfee81735f037b22cb
Reviewed-on: http://codereview.qt-project.org/5011


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Task-number: QTCREATORBUG-5970
Change-Id: Iaccefa8583e94a42c59ea658d474401a378dcce7
Reviewed-on: http://codereview.qt-project.org/5019


Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: Ida0eea494e3362a7dcf1df9dd5ac915c61af2524
Reviewed-on: http://codereview.qt-project.org/5018


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: Ice9fa1294f29e1376afbf7af1a112e7d99a44b10
Reviewed-on: http://codereview.qt-project.org/4998


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Task-Number: QTCREATORBUG-6115
Change-Id: I433f5dafbdf6fc4fe49c43a7e750d1f353b4ea58
Reviewed-on: http://codereview.qt-project.org/4988


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I57fedc5a2525e7e520e9ba8586e5d5f3eb4da091
Reviewed-on: http://codereview.qt-project.org/5005


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I0e9a856ab3bea80b730ba30d343c5ab88df83db2
Reviewed-on: http://codereview.qt-project.org/4991


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lasse Holmstedt

Warn when using a mkspec that might or might not work with the selected
tool chain.

Task-number: QTCREATORBUG-5854
Change-Id: Ifead5108ccd109f66707ad7aa371daead8cb57e7
Reviewed-on: http://codereview.qt-project.org/4522


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I9a74bd726d9691ca93477916159a80c04c35f52d
Reviewed-on: http://codereview.qt-project.org/4987


Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Change-Id: Iff5f8cf26e580ede4f82aba5a36acd785521da8d
Reviewed-on: http://codereview.qt-project.org/4890


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Change-Id: I6a803c770e8adf27fb7f6227d0d71c20ed0dffcf
Reviewed-on: http://codereview.qt-project.org/4985


Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I4088695312de5ea526578c6b901a79a9662797b8
Reviewed-on: http://codereview.qt-project.org/4961


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Fixes: c861af52

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: Ie4edae18de3dd3444a55619d303704a8b13f65bd
Reviewed-on: http://codereview.qt-project.org/4966


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Id795a363c9f990e9506eb35ed5a398948f93cf2f
Reviewed-on: http://codereview.qt-project.org/4967


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Task-number: QTCREATORBUG-5382
Merge-request: 388
Reviewed-by: ossi

Change-Id: Ie80fdbe2eadb55d3b5684ebc7a79162317d1a36b

Fixes a crash when having the oldest search result open while initiating
a new search (e.g. find usages).

Change-Id: I825266b28daaf472e48299a51719a058af7bba6e
Reviewed-on: http://codereview.qt-project.org/4952


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

debugger links against cpptools library

Change-Id: I9c1435cf1511f2962e11b5ef488b9764024aa7f1
Reviewed-on: http://codereview.qt-project.org/4959


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b

Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948


Reviewed-by: hjk <qthjk@ovi.com>

When the assist interface is detached the correct thing to do
is to clone the document, not simply to copy the text content.
Then data like the user state is preserved.

For the particular issue below, the problem is that the simple
lexer doesn't have the correct initial state and thus cannot
identify its inside a comment.

Task-number: QTCREATORBUG-6061
Change-Id: I59380eeb229e322bafb1e799d649df90327c0f54
Reviewed-on: http://codereview.qt-project.org/4912


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>