Git: Limit size of git blame output when using omit-date

* Do not use setPlainTextData on VCSBaseEditor only as that one implements
  the size limits on VCS output.

* Rework removal of date data from lines to limit copying

Change-Id: Ic1f507eb7bdabdb82b4a37a3d3e6f9381775b680
Reviewed-on: http://codereview.qt.nokia.com/780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

QmlDesigner.formeEditor: add handler for context menu

This patch adds a handler for a context menu to AbstactFormEditorTool.
Also all the tools are patched to ignore right mouse keys for now.

The ResizeManipulator gets an active property.

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

analyzer: remove output pane

It's all dockwidgets now.

Change-Id: Ia47ca9331fdfbe12ca11f77c26afc35e73a2fae3
Reviewed-on: http://codereview.qt.nokia.com/776
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

analyzer: use dockwidget also for the memcheck tool

Change-Id: I40d3a03e80627b4ff62ff84726dd6de3bcb1f5ea
Reviewed-on: http://codereview.qt.nokia.com/775
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

QmlDesigner.qmlModelView: optimization

With this patch the properties are set before the newNode is reparented.

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

VCS: Improve tab width handling in VCS editor

Use settings for generic files that do not belong to any project for
e.g. git diff. That way a user can actually override the tab width
which used to be hardcoded to 8.

This is not perfect: Actually we should use the tab width defined for
the file type in the project it belongs to. That does require
significantly more work though.

Task-number: QTCREATORBUG-5178
Change-Id: I509b030e09c33a74ecd529294bf08afec21b2121
Reviewed-on: http://codereview.qt.nokia.com/768
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Check QMLType when adding new QML files to project to prevent error message being shown

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

QmlInspector: Get rid of explicit 'Design mode' button

Instead let the user just select & deselect between the Zoom Tool,
the Selection Tool and the Color Picker.

Change-Id: Ieac0bc0381760237004599e59cafa43544fb03d4
Reviewed-on: http://codereview.qt.nokia.com/753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Fix gcc warning.

Change-Id: I17560ff68542e99f882b2c0c315ea85b4729f19a
Reviewed-on: http://codereview.qt.nokia.com/758
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

QmlProfiler: minor improvements in rangedetails display

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

QmlProfiler: Clear button in toolbar

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

Git: Document remote and branch dialogs

Change-Id: I8b244b68ea6bca5118f5be8c1116d6eeec3e49bd
Reviewed-on: http://codereview.qt.nokia.com/761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

qmldump: Fix export comparison.

Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

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

Fix UiPublicMember::lastSourceLocation.

Mirrors http://codereview.qt.nokia.com/#change,755

Change-Id: I7d1222bda67344456710ada52af33d17688627ca
Reviewed-on: http://codereview.qt.nokia.com/757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

RemoteLinux: Rename some classes and the associated files.

Also make them external.

Change-Id: I21a74c1f7124646b5507ffd2ee0e24c7c60eca97
Reviewed-on: http://codereview.qt.nokia.com/749
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Debugger: Add infrastructure for message tracepoints.

Add context menu to add a 'message tracepoint', that is,
a trace point that outputs a user message and continues.
Intended to be a replacement for manually inserting
a qDebug() into the code to understand the call sequence.
Yet to be implemented for gdb.

Change-Id: I1c303001421fbbae74d98d15d52718579350db6e
Rubber-stamped-by: hjk
Reviewed-on: http://codereview.qt.nokia.com/756
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Doc: Analyze mode and QML profiler

Change-Id: I8edbcfc43caf312da05248c86ca6ad41733e941b
Reviewed-on: http://codereview.qt.nokia.com/731
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

debugger: move updateMarker from BreakHandler to BreakpointItem

Change-Id: Ie3bafc8fc23cc95e0795d57dac956b3345e671dd
Reviewed-on: http://codereview.qt.nokia.com/748
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

debugger: workaround for not-updated markers

Change-Id: Ic0bb344a117496dbada0ccef181a08f5b5bbbb8c
Reviewed-on: http://codereview.qt.nokia.com/747
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

debugger: improve handling of subbreakpoints in gdb 7.2 and earlier

Change-Id: I6cd4c2a07544ea902798e2e4596bd56e634f15e3
Reviewed-on: http://codereview.qt.nokia.com/746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

debugger: split BreakpointIndex into plugin and debugger specific part

Change-Id: I21d10cf42eb039c74475e106537b6e107d155196
Reviewed-on: http://codereview.qt.nokia.com/745
Reviewed-by: hjk <qthjk@ovi.com>

debugger: handle results of manual break commands

Change-Id: I0ab8ad3ef3ddfe7c8d69fd163864875190698475
Reviewed-on: http://codereview.qt.nokia.com/744
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

RemoteLinux: Fix widget appearance.

Change-Id: I8c6a125d07192c7ffea8c1b6c91b860299d1c33f
Reviewed-on: http://codereview.qt.nokia.com/737
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Harmattan: Change display name for device type.

Change-Id: Ifd3e504d39b2d20c72e5d551db45c33ccd82372d
Reviewed-on: http://codereview.qt.nokia.com/736
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Build fix

Change-Id: I6c03d613c0dcda92ef411265e1d3d1ff679ee0a8
Reviewed-on: http://codereview.qt.nokia.com/735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

QmlDesigner.propertyEditor: adding checkbox_tr.css

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

Abi: Update to use creator-test-data repo for the abi test data

Change-Id: Ie5ce3dd0d821516355bd43748f180e3323bb5879
Reviewed-on: http://codereview.qt.nokia.com/696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

QmlDesigner.QtQuickPlugin: update for views

ListView/GridView and PathView are now populated with code

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

QmlDesigner.model: allow creating items from qml code in library

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

QmlDesigner.symbianPlugin: update

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

QmlDesigner.documentController: switching to master model on mode change

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

QmlDesigner.itemLibraryInfo: add qml property for library

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

QmlDesigner.componentView: fix for captions

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

QmlDesigner.documentController: cleanup

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

QmlDesigner.designDocumentController: reset formeditor

We are reseting now the formeditor when switching the mode.

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

QmlDesigner.model: add resetView() to AbstractView

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

QmlDesigner.rewriter: improve debugging

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

QmlDesigner.modelMerger: fix

The properties nodeSource and nodeSourceType also have to be copied.

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

QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails

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

QmlDesigner.rewriter: crash fix

This fixes a bug for UiObjectBindings.
This just did not handle the binding case properly.

Change-Id: I543a1d839d5960044b5a5a39f506af753a70c287
Reviewed-on: http://codereview.qt.nokia.com/723
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Remove compilator's warning

Change-Id: I3e08eec23ae6c825f056218840d7534b66037046
Reviewed-on: http://codereview.qt.nokia.com/714
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>

Better name for enum value.

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

Don't keep canceled tasks forever.

They'll fade "after user interaction" now (since canceling will most
probably lead to mouse movement over the widget that already counts as
interaction, i.e. after pressing 'x' it will fade after a while).

Task-number: QTCREATORBUG-4456
Change-Id: Id095a6bbd5819b93ec8cb9f514b429ef5ab231e9
Reviewed-on: http://codereview.qt.nokia.com/712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QtQuickApp wizard: Add Qt Components for Meego/Harmattan

Change-Id: I4809de36e4913037439ab9eb7c56021431cff365
Reviewed-on: http://codereview.qt.nokia.com/704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

QtQuick Wizard: Improve wording of Components page

Change-Id: I02a2b4ca77a631db9ebfbf949d9a79d5a820bb4a
Reviewed-on: http://codereview.qt.nokia.com/703
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"

This reverts commit 31904563bb2666c73bce71eeb7b5a166691a2b9d.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

QtQuickApplication wizard: Don't show Harmattan targets for symbian components

Change-Id: Ia5108c04d7898567ece7b5498359c88210ed2682
Reviewed-on: http://codereview.qt.nokia.com/695
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

SSH: set correct attributes when uploading a file.

Change-Id: I59484d5e66491e8941992abdd2a478364ec258a7
Reviewed-on: http://codereview.qt.nokia.com/710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Remove unused variables.

Change-Id: I55ba7af5f9d4f036d3562cb1e4475809e79f8b24
Reviewed-on: http://codereview.qt.nokia.com/700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

CODA: API has changed

and Creator site has to be adjusted

Change-Id: If93d56bc2ad19aae985e8e861c6030950d8d846d
Reviewed-on: http://codereview.qt.nokia.com/706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Symbian: SIS as a format must be uppercased

sis as an extension should be lowercased

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

PublishToOvi: Text fixes

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

TargetSetupPage: Do not show targets that do not have required features

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

Qt4BaseTargetFactory: Expose list of generic 'features' for a target

Replace the isMobileTarget, supportsShadowBuilds methods by a
generic targetFeatures method which exposes features as a set of
strings.

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

CODA: QtQuick component version is now displayed

in the device's information

Change-Id: I730dfdb807a41696c81c6544f22c8b8c13bd6a72
Reviewed-on: http://codereview.qt.nokia.com/707
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>

CODA: Connect the right SIGNAL-SLOT

Change-Id: If3193baa1530526c0b26e799e9f6f57065d419a2
Reviewed-on: http://codereview.qt.nokia.com/705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>

RmoteLinux: Fix variable usage.

Change-Id: I89dff1adde47393bd1b9f05bbe23698bcd04eab0
Reviewed-on: http://codereview.qt.nokia.com/701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Fix gcc warning.

Change-Id: I42dee44f1cee68d83d803174f477b79131a7e109
Reviewed-on: http://codereview.qt.nokia.com/702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Symbian: New system version descriptions added

Change-Id: I6eaac635c27ee4dc04bedc96a3a70117bd3fd773
Reviewed-on: http://codereview.qt.nokia.com/630
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>

Generic Project Wizard: Fix Icon of root item in edit files

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

QmlJS: Fix error location for prototype errors.

Change-Id: Iaeb96ff67cfc92bcddeb1b7075b7fdcbaed317c0
Reviewed-on: http://codereview.qt.nokia.com/691
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

CodeAssist: Relax a bit premature match

In a relatively recent commit (99fee33fd1a5e82b7be3d17a74229efaaf7571ef)
premature match was setup to work only on explicit invocations. However
this has shown to be too strict. Therefore, it's now a bit relaxed (not
as much as before): If the current item ends with the typed character we
assume  this is intenional - general premature matches do not end with
identifier characters anyway.

Note: Leaving only the last character as the condition is not an option
since sometimes they are not shown in the proposal description.

This patch also lifts the text method to IAssistProposalItem since
it's reasonable the every proposal must have at least some description.

Change-Id: I2ef7de2b7f978ce7059cce50175137a03315f495
Reviewed-on: http://codereview.qt.nokia.com/675
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

CodeAssist: Expand prefix only when it's a completion

Quickfixes, for instance, should not be expanded.

Change-Id: I832ea11c5a270ee290441aca0d2c7231d0ced013
Reviewed-on: http://codereview.qt.nokia.com/674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

QmlJS: Manually fix location qmltypes.

The new location plugin does not export some of the 1.1 types anymore.
I've manually added the missing exports.

Change-Id: I19886a40fa61ab01f21b581fee315619f98668fd
Reviewed-on: http://codereview.qt.nokia.com/689
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Remote Linux: Get rid of indirection when setting up deployables.

It might have been useful at some point, but certainly isn't now.

Change-Id: Ibb5d2d1133a6022617336be78f1ff23a3d734a2f
Reviewed-on: http://codereview.qt.nokia.com/690
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlJS: Add 'reset code model' action.

Having to restart Creator should be a thing of the past.

Task-number: QTCREATORBUG-4813
Change-Id: Ide242ee299b5d34aecba4823032e27741dde4a86
Reviewed-on: http://codereview.qt.nokia.com/668
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Merge branch '2.2'

Conflicts:
qtcreator.pri
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
src/libs/qmljs/qmljsdocument.cpp
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/libs/qmljs/qmljslink.cpp
src/plugins/cppeditor/cppquickfixes.cpp
src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
src/plugins/qmldesigner/qmldesigner.pro
src/plugins/qmldesigner/symbianplugin/symbian.metainfo
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617

Revert "BuildstepConfigWidgets can be set expanded by default"

This reverts commit deae00a12e197943a69dd980c401b9cbdb3baba4 for master.

Revert "Qt4ProjectManager exports for RemoteCompiler"

This reverts commit 66b415f90387e7edb13a9bc6a1bddd98780e19b5 for master.

Revert "Custom targets can set QtVersion to support id and set abis"

This reverts commit 462278b0710316819372571fbcf40c62088302d4 for master.

Global regexp search would eat all memory for matched empty lines.

E.g. for '^$'. also for '.*'

Task-number: QTCREATORBUG-4443
Change-Id: Ic164361ccdf791c2d0ec3c6ec501e34c9ec3fda6
Reviewed-on: http://codereview.qt.nokia.com/681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

RemoteLinux: Move current device configuration to deploy configuration.

It used to be in the deploy steps itself, which is theoretically
more flexible, but offers no advantage in practice and also causes
a lot of hassle.

Change-Id: I0eafaf8477067fced86b7a05fd94d72a35e02bb7
Reviewed-on: http://codereview.qt.nokia.com/654
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Debugger[CDB]: Do not detach on shutdown in case of console.

Do not use effectiveStartMode in shutdown.

Change-Id: Ia300f511f335de4a7d9d7c07e2080cecc91042e4
Reviewed-on: http://codereview.qt.nokia.com/680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Remove some aggregation deadlocks.

You are not allowed to add components that belong to other aggregate
(including aggregates themselves). Warn in this case instead of locking
up.

Task-number: QTCREATORBUG-4926
Change-Id: I4908fb9019efbc2fa3b7c3c57e08cc1d7f8f3e2c
Reviewed-on: http://codereview.qt.nokia.com/679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>

Find/replace tool bar wasn't usable in very small width editors.

E.g. in split editors with small main window. We now have line edits
with a minimum size and use a flow layout for the replace buttons (which
will reduce width when necessary by laying out vertically).

Flow layout is taken from the Qt examples.

Task-number: QTCREATORBUG-3279
Change-Id: Ic07d4d3e75e3d928d6b53534adb42481ce26256b
Reviewed-on: http://codereview.qt.nokia.com/666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

QmlProfiler: Callers and Callees separate views

Change-Id: Ifa3939eeda2a473722cbd8dfac33794a15d8c453
Reviewed-on: http://codereview.qt.nokia.com/678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Remote Linux: Fix possible crash.

Change-Id: I1519117381dbeb22d40546ecf8467079ca85aa35
Reviewed-on: http://codereview.qt.nokia.com/677
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Harmattan: Create empty Aegis manifest file on target creation.

This way, the developer gets a hint about what to edit when
it becomes necessary to manually set capabilities.

Change-Id: I03ef476b87cba26fd15d1bc28ba652d4114578b6
Reviewed-on: http://codereview.qt.nokia.com/676
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlProfiler: Dependencies view

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

Qt4Project: Reset QML import paths in ProjectInfo.

Previously, import paths would accumulate.

Change-Id: I2f6f12abde7906fc823323e4470af7a19afa304e
Reviewed-on: http://codereview.qt.nokia.com/667
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QtQuickApp wizard: Add option for QtQuick 1.1 module

Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

QmlJS: Respect the REVISION property for methods and properties.

Task-number: QTCREATORBUG-3907
Change-Id: Ic2c1f8cafe381e5216ae7ad73502ca0fae20dda0
Reviewed-on: http://codereview.qt.nokia.com/656
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

RemoteLinux: Fix possible crash.

We cannot assume that a deploy configuration is present.

Change-Id: I396f630d2ad01f2b17d65c41ad4b2ec587b7e48d
Reviewed-on: http://codereview.qt.nokia.com/653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

debugger: update our gdb patches

Change-Id: I1c81b28ab22ec11dcef1f58030b5906f4fc6323c
Reviewed-on: http://codereview.qt.nokia.com/652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

debugger: correct comment in dumper.py

Change-Id: Ic1d33180515ad79c4233b013ec7d3530674d5117
Reviewed-on: http://codereview.qt.nokia.com/651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

debugger: remove listing of breakpoints in dumper code

This was meant to provide breakpoint notifications which are available
in gdb 7.3.50.x now.

Change-Id: I09ced542bb5171f10350b9dc722cab3376d1ded8
Reviewed-on: http://codereview.qt.nokia.com/650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

QmlJS: Fix completion inside grouped propery bindings.

Task-number: QTCREATORBUG-3541
Change-Id: Ida8e59b65836c8515fbfbd2a9e4737d9ae04e76c
Reviewed-on: http://codereview.qt.nokia.com/639
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Fix warning about || and && usage

Change-Id: Ibdacd1ae51b2203c66030a2191cb3eadc41f630a
Reviewed-on: http://codereview.qt.nokia.com/648
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

Abi: Fix detection of ELF files on big endian machines

Change-Id: I1301e463fc97fa9615398a2a120874c809975ae5
Reviewed-on: http://codereview.qt.nokia.com/647
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

qmldump: Use binary that's shipped with Qt if available.

Change-Id: Ia36dcc2596fbe6aef5014d03ed0303d3087ecc0b
Reviewed-on: http://codereview.qt.nokia.com/547
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlJS: Fix completion of 'anchors.'.

The hasChildInPackage function was broken, so we completed 'anchors:'
instead.

Task-number: QTCREATORBUG-5180
Change-Id: I0e0d68aec3cf4e5bea991e39169beecf541ce477
Reviewed-on: http://codereview.qt.nokia.com/643
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

QmlJS: Always generate a onXyzChanged slot.

Even if the NOTIFY signal listed for the property has a different name.

Task-number: QTCREATORBUG-3614
Change-Id: I748cddab89732acd6a56b243610be52873225064
Reviewed-on: http://codereview.qt.nokia.com/637
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

qmldump: Fix for extended objects.

Before, extended objects had the same exports as the base object
which lead to trouble.

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

Build fix

Change-Id: I38ed5c003fe24ef376c4043a8b4ce17f7848d7bd
Reviewed-on: http://codereview.qt.nokia.com/646
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

vcsbase: auto save settings when requested by Core::ICore

Bazaar and Mercurial plugins are impacted

Change-Id: Ia781dae79983350d773f454de32f812e876bfbfb
Merge-request: 350
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Doc: add Nokia N9 and update Harmattan info

Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Doc: add version numbers to the doc titles

Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124
Reviewed-by: David Boddie
Reviewed-on: http://codereview.qt.nokia.com/640
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlJS: Don't try to complete slots in lhs of binding.

Task-number: QTCREATORBUG-3459
Change-Id: I694391bf7ccddcaa539ec4ed2b744e875cc43f38
Reviewed-on: http://codereview.qt.nokia.com/626
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

QtQuickApp wizard: Use qsTr() for string

Change-Id: Ie2f40065c000b5bf588a0cd5470ec42091080c97
Reviewed-on: http://codereview.qt.nokia.com/621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>