QmlProjectManager: Make sure project tree updates after in project file change

Use FileManager instead of our own FileSystemWatcher, since this one only signals
the first file change (cause Qt Creator apparently removes the file and creates
a new one on each change).

Change-Id: Idacd545e41cd3ee29bfbc122526b9097039c65d0
Reviewed-on: http://codereview.qt-project.org/4975
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

QmlDesigner: remove dead code

Change-Id: I2f88af9ef449ee21e646dab7ca23b97836249764
Reviewed-on: http://codereview.qt-project.org/5128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

QmlDesigner.formEditor: usablity fix

Displaying the bounding Rectangle  makes no sense for small/thin items.

Change-Id: Ia30692e0cfa2641cfe3b4962a2f54f9eafe50201
Reviewed-on: http://codereview.qt-project.org/4984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

QmlDesigner.model: bugfix for Qt Quick 2.0

The item itself can have any version. we have to check for the version
of QtQuick.Item.

Change-Id: I57a992dd09491b7990318e208d98a9c4e0011e56
Reviewed-on: http://codereview.qt-project.org/4983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

Git: Added decoration to log and show

Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Git: Fix diff/show/blame editors coming to the foreground

Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.

Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Find: Change a few accelerators

Since the find widget is no longer a dialog, a few accelerators
"conflict" with others from the main menu and global Creator's.
This doesn't really stop them from working, but it would be better
to have different ones. The new values are not the most obvious
ones, but there's not too many options.

Task-number: QTCREATORBUG-6114
Change-Id: Idbc885abad9b78dad7685568a9524066dc075694
Reviewed-on: http://codereview.qt-project.org/5147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Merge remote-tracking branch 'origin/2.3'

QmlJS: Use new Lexer::scanDirectives.

Change-Id: Id9f4cd6a53dc0d3f4cf0a0b3c846eca0e48372fc
Reviewed-on: http://codereview.qt-project.org/5144
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

QmlJS: Update parser from Qt5.

Change-Id: I26a5fb6a1eb99a777e4f1e01fb7b19e559c9bce7
Reviewed-on: http://codereview.qt-project.org/5143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

QmlDebugger: Attach to QML Port: Fix errors

Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlJS: Fix highlighting of property types.

Task-number: QTCREATORBUG-6127
Change-Id: Iae5cd6256b2f1e792c3c91eb5915e3f082753e6e
Reviewed-on: http://codereview.qt-project.org/5136
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Fix enum completion with 'as' imports.

Change-Id: Ifc229c23c14a6395c9d3e5f7ec76b9b04678787d
Reviewed-on: http://codereview.qt-project.org/5134
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner: Add null checks.

Change-Id: I8f12a5391ec20829422d8c6eab3d4d191527e70e
Reviewed-on: http://codereview.qt-project.org/5130
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Rework exported C++ type registry.

The problem was that if you exported
A 1.0, A 1.1 and B 1.0 where A is the prototype of B
the code model had not enough information to know that, depending
on the import, B 1.0's prototype should be A 1.1 or A 1.0.

To solve this problem QmlObjectValues now store the import's version
as well as the local component version. In the example above B 1.0
would have import version 1.1 if the 1.1 module was imported and thus
be able to choose the right prototype.

Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3
Reviewed-on: http://codereview.qt-project.org/5129
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Make Qt Installer Framework Update Notifier part of QtCreator.

Always compile but never run it unless UPDATEINFO_DISABLE
is being set to 'false' via qmake or environment.

Change-Id: Ie53fb2ea99bfebac1b6f416939554f25a5e481a7
Reviewed-on: http://codereview.qt-project.org/4483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

RemoteLinux: Take adavantage of new proParsingDone() signal.

Change-Id: I81aada97401a1f100f5e6c8376c297c8f2f86688
Reviewed-on: http://codereview.qt-project.org/5141
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Add Qt4Project::proParsingDone(), which is emitted after parsing

Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

debugger: fix a wrong sanity check in the dumpers

Change-Id: Ie2dce425cf1204f22bb752bd400bc98211b45a63
Reviewed-on: http://codereview.qt-project.org/5126
Reviewed-by: hjk <qthjk@ovi.com>

debugger: show at least "elide" markers for thread ids

Task-number: QTCREATORBUG-6110
Change-Id: I439fc6463c42fce134646c620ac19a5c533217fe
Reviewed-on: http://codereview.qt-project.org/5123
Reviewed-by: hjk <qthjk@ovi.com>

minor style

Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>

qt4project: disable debug output

Change-Id: I33ae40566677d9b80b27facddab25c1ee7905761
Reviewed-on: http://codereview.qt-project.org/5118
Reviewed-by: hjk <qthjk@ovi.com>

QmlJS: Change from QMap to QHash for QString keys.

Tests indicate that lookup in QHash<QString, ...> is more performant
even for short strings.

Change-Id: I8e5a73d0f1a72e202522f397b16901887f9c3591
Reviewed-on: http://codereview.qt-project.org/5070
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Dumper: QHash: corrected variable usage

Merge-request: 389
Reviewed-by: hjk <qtc-committer@nokia.com>
Change-Id: I331cef5cff4d8a21e1104efffe5896f944573d7d
Reviewed-on: http://codereview.qt-project.org/5117
Reviewed-by: hjk <qthjk@ovi.com>

all: less QScopedPointer

Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>

more style

Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>

QmlJS checks: Don't crash if try has no catch or finally.

Change-Id: If7001963bc11f2fa01f058c903ee014f6acb0c04
Reviewed-on: http://codereview.qt-project.org/5102
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

QmlDesigner.formEditor: use pure virtuel instead of assert

Asserting because of unexpected mouse events is evil.

Task-number: QTCREATORBUG-6042
Change-Id: Idc21b1cb6bfebead4eab80f6526235164b3f8d54
Reviewed-on: http://codereview.qt-project.org/5090
Reviewed-by: hjk <qthjk@ovi.com>

Fix proFileUpdated signal

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>

QmlProject: Update code model even without valid qmldump.

Change-Id: I6c27fe4ca0201cbbe929821d4408d61a068e8982
Reviewed-on: http://codereview.qt-project.org/4968
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlProject: Add qmlproject files to x-qml mimetype.

Change-Id: Ia8ff967badea1ca499da03651b3e7e0c2f78fd7b
Reviewed-on: http://codereview.qt-project.org/4951
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Fix thinko

Change-Id: I835b42cc1d16df43200579cc1bf85422784bf79d
Reviewed-on: http://codereview.qt-project.org/5085
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Doc: remove unnecessary qdoc tag

Change-Id: Ib0d8a7bf7ad741f12c179b6215df44ed04f82534
Reviewed-on: http://codereview.qt-project.org/5079
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: fix typo

Task-number: QTCREATORBUG-6123
Change-Id: Ide0460317561c116fdaf12f400cc8b12f5c40ca0
Reviewed-on: http://codereview.qt-project.org/5078
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Reduce vertical minimum size of perforce settings.

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>

ABI: Make "linux-generic" ABIs compatible with "linux-*"

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>

JSDebugger: Enable break on events.

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>

d-ptr style

Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075
Reviewed-by: hjk <qthjk@ovi.com>

whitespace

Change-Id: I67b156ab6f44ccdfe199b4928f6f62129b05b0b7
Reviewed-on: http://codereview.qt-project.org/5074
Reviewed-by: hjk <qthjk@ovi.com>

debugger: hard-code some qt5 related paths

This is not a final solution.

Change-Id: I19e7a99e1b056704864d27855197678a0d3fd10b
Reviewed-on: http://codereview.qt-project.org/5073
Reviewed-by: hjk <qthjk@ovi.com>

debugger: add manual test for QVariantMap

Change-Id: I32341ddc529cc20f5c7d1f907d88a05f5e062cb0
Reviewed-on: http://codereview.qt-project.org/5072
Reviewed-by: hjk <qthjk@ovi.com>

Merge remote-tracking branch 'origin/2.3'

Make linux devices configuration less huge.

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>

SemanticHighlighter: Fix off-by-one in assert.

Change-Id: Ie9331d233894e49cf86605819687eeef765272df
Reviewed-on: http://codereview.qt-project.org/5067
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Harmattan: Don't overwrite manifest file when opening project.

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>

Doc: update screenshot

Task-number: QTCREATORBUG-5970
Change-Id: Iaccefa8583e94a42c59ea658d474401a378dcce7
Reviewed-on: http://codereview.qt-project.org/5019
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: Qt support on devices

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>

QMLProject: Pick the correct QMLViewer depending on Qt Version

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>

Include qmldesigner plugins in "make install"

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>

debugger: mark optimized out values as such

Change-Id: I57fedc5a2525e7e520e9ba8586e5d5f3eb4da091
Reviewed-on: http://codereview.qt-project.org/5005
Reviewed-by: hjk <qthjk@ovi.com>

crumblePath: adding dataForLastIndex()

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

qmake: Warn when using a mkspec that might not work with the tool chain

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>

utils, qmljstools, vcsbase: s/\bm_d\b/d/g

Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>

QmlJS: When completing enums, add Item.Foo instead of "Foo".

Change-Id: I9a74bd726d9691ca93477916159a80c04c35f52d
Reviewed-on: http://codereview.qt-project.org/4987
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlProfiler: Re-enable attaching to a (remote) port

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>

debugger: work on manual test

Change-Id: I6a803c770e8adf27fb7f6227d0d71c20ed0dffcf
Reviewed-on: http://codereview.qt-project.org/4985
Reviewed-by: hjk <qthjk@ovi.com>

qmldesigner: code style

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>

Qt4Project: Update code models if a folder watch changes the file list.

Fixes: c861af529ec87b34f1ca45d917d367c345334859

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

fix 'analyse' in French translation

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>

Qt4Project: Always notify the code models if the file list changed.

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>

Process Stub: Release file handle

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

Fix crash with multiple search results.

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: Make sure cpptools is compiled first

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>

Merge remote-tracking branch 'origin/2.3'

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

Coding style: Pure virtual functions, private implementation pointers.

Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948
Reviewed-by: hjk <qthjk@ovi.com>

Code assist: Fix doxygen completion

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>

Doc: add screen shot

Change-Id: I00b48066026929ef1773f8c231ee1c57e45f8f9e
Reviewed-on: http://codereview.qt-project.org/4925
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Updated Russian translation

Merge-request: 384
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I73077a68f3c674f32198a71eeafc60115f2465cc

Doc: update Symbian information for Anna and Belle

Change-Id: I7b59d10ceed278a98b6c7d3e99b87ca4986d8e20
Reviewed-on: http://codereview.qt-project.org/4921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: update screen shot after Forum Nokia was renamed Nokia Developer

Change-Id: I4c9e39c04e9773de2b239277e99ccbdd8be5e6e6
Reviewed-on: http://codereview.qt-project.org/4920
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: separate MeeGo and Maemo instructions

Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

debugger: better remote debugging

Add option to specify location of debug information to dialog.
Default is sysroot + usr/lib/debug.

Change-Id: I8c2ab448f4aba9385da617d23419e521e3ae263c
Reviewed-on: http://codereview.qt-project.org/4919
Reviewed-by: hjk <qthjk@ovi.com>

RemoteLinux: Allow deploying to and running on non-Linux unices.

Change-Id: Ib8b8648cc93c37415e0cdb9785f47afbf04e781e
Reviewed-on: http://codereview.qt-project.org/4070
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

debugger: split the 'start and debug remote' and 'attach to remote' cases ui-wise

Change-Id: I229ba996bfe2b38fb30891cdad5f62b6fe430443
Reviewed-on: http://codereview.qt-project.org/4898
Reviewed-by: hjk <qthjk@ovi.com>

HG: Use -A when commiting

Fixes commiting of untracked files.

Change-Id: I7111ed8a74ce80876a2ec2220ceace6f7aa77373
Reviewed-on: http://codereview.qt-project.org/4892
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

fakevim: mention comma escape in documentation

Change-Id: I3f62b7073c3bafc37420ee447465a904070a1515
Reviewed-on: http://codereview.qt-project.org/4880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

vcsbase: add mechanism to ease management of VCS settings

Management of VCS settings was rather laborious (see BazaarSettings,
GitSettings, ...).
To overcome this, the base class VCSBaseClientSettings is now
equipped with a mechanism factorizing redundant code for VCS settings,
like operator=(), operator==(), writeSettings(), ...
Heir classes of VCSBaseClientSettings only need to declare the
settings (key + default value).

Bazaar and Mercurial plugins are impacted.

Change-Id: I7e4093a6d9476f3c8954f4d104f1b26ac185beb9
Merge-request: 2204
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

debugger: fix hex input when changing register values

Change-Id: I198e1631d488aff9250e3438ed2fade5aa89968b
Reviewed-on: http://codereview.qt-project.org/4888
Reviewed-by: hjk <qthjk@ovi.com>

debugger: allow partial updates to the register set

Change-Id: Iafa2f9a235e3c44e0d225a1700a9c4d202f13959
Reviewed-on: http://codereview.qt-project.org/4887
Reviewed-by: hjk <qthjk@ovi.com>

QmlJS highlighter: Remove unused function.

Change-Id: I7ddf5783402b0a2262be2e0142b4125db2d55cbf
Reviewed-on: http://codereview.qt-project.org/4883
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Improve completion of signals.

* Change from Reference to FunctionValue: There was no reason for them
  being References as the argument types never need lookup.
* Enumerate in global completion: When you define 'signal foo(int a)'
  you now get completion for 'foo' and will get the function argument
  hint popup.

Change-Id: Ic348db477a34ba468dfdb690499a9cd8fd605cd2
Reviewed-on: http://codereview.qt-project.org/4774
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Editor: New option for surrounding auto brackets

Notice that this option already existed in the auto completer. However,
from the user perspective it was synchronized with auto insert brackets.

Task-number: QTCREATORBUG-5835
Change-Id: Ia87a2ca38d89dba51380a4fdb58a5a3689ed9265
Reviewed-on: http://codereview.qt-project.org/4885
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Support returning 0 from RunConfiguration::createConfigurationWidget

The android plugin does so.

Change-Id: If5e5216bbcb6ba3dcd4186ae4c558efe4d56dcb8
Reviewed-on: http://codereview.qt-project.org/4882
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QmlJS highlighting: Use semantics for types and binding names.

This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.

Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Simplify check if a document instantiates a component.

Change-Id: If45002ecec56ca766ef7a0c7878c0a48fadee452
Reviewed-on: http://codereview.qt-project.org/4734
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

QmlJS: Adjust existing code for updated QML parser.

Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72
Reviewed-on: http://codereview.qt-project.org/4733
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Merge parser updates from Qt5.

Change-Id: Ibed38abca8f7e7bae7d424751a18c83f4c9e9bc5
Reviewed-on: http://codereview.qt-project.org/4732
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

QmlJS tests: Fix compile of 'check' test.

Change-Id: I6cccb55d4c49eb6cf77ac4d1378d3d7adac95a32
Reviewed-on: http://codereview.qt-project.org/4881
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

ProjectExplorer: Fix potential crash when removing files

Change-Id: I0973d92ae5bdcc89482a55f011d55bc7383b757b
Task-number: QTCREATORBUG-5961
Reviewed-on: http://codereview.qt-project.org/4877
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QMakeStep: Honor declarative_debug configuration for imported builds

Honor the qmake line that is imported: If it contains declarative_debug
or QMLJSDEBUGGER_PATH, also set the option in the qmake step, if not
not.

Change-Id: Ibc524ff8d39b66f76cc79807264db0dd3534e2d7
Reviewed-on: http://codereview.qt-project.org/4090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QMakeStep: Move recompilation dialog to QMakeStepConfigWidget

Change-Id: I20576fa99d9a1d04c24f9615317663e943619200
Reviewed-on: http://codereview.qt-project.org/4089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

JSDebugger: Break on Exception

The debugger breaks on Javascript exception. The error message is
printed on the ScriptConsole and the relevant code is marked with
a wavy underline.

Change-Id: I5e6f603430c3b8a0db450d1e8c821714ec0140ab
Reviewed-on: http://codereview.qt-project.org/4276
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlJS checks: Add tests.

Change-Id: I37852b7b4f1720c276fc3aea3b1892613028ec48
Reviewed-on: http://codereview.qt-project.org/4658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS checks: Correct the check for dangerous == and add tests.

Change-Id: Ie0f4062069bf241020868af34ce6d36146b4b0c7
Reviewed-on: http://codereview.qt-project.org/4646
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Add infrastructure for tests of QML static checker.

Change-Id: Idf49bc0c29ad82456a5fe65e2acced6a4fb130fc
Reviewed-on: http://codereview.qt-project.org/4552
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Cleanup Link.

* Don't use Qt macros for d-ptr.
* Move private functions to LinkPrivate.

Change-Id: Icb6f579e9168dd9bf5cccec1255fda1939e47c9a
Reviewed-on: http://codereview.qt-project.org/4767
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Enable 'follow symbol' for local variables.

Task-number: QTCREATORBUG-6094
Change-Id: Icf286bc412b48dbd1cb38c47ad7b91040b5aae0f
Reviewed-on: http://codereview.qt-project.org/4864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDebugger: Added dialog "Attach to QML Port..."

The dialog is added to Debug->Start Debugging menu option. It specifies the host
and port that the JSDebugClient connects to for listening to debug messages.

Change-Id: I7f828c169ff2338f4780025f72182c5fc8784c4a
Reviewed-on: http://codereview.qt-project.org/4824
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlJS tests: Make basic test pass again.

Change-Id: Iff7d36e7c7908b267fc02cd46e3f2a173ef5c7b9
Reviewed-on: http://codereview.qt-project.org/4547
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJS: Improve import error messages.

Change-Id: Ief305b787fbc4577acfdec41083bc72e178db46d
Reviewed-on: http://codereview.qt-project.org/4537
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>