Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/find/Find.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/ScmGit.pluginspec.in
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/locator/Locator.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
	src/plugins/regexp/RegExp.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/vcsbase/VCSBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in

This will enable comlpetion and validation for projects using the Qt
Mobility plugins even when the qmldump machinery fails.

Tries to figure out the editor type from the title pattern in that case.

Task-number: QTCREATORBUG-2936

There are many int to ModelNode hashes in the views. This patch implement a int to ModelNode hash in the model to make them obsolete.

Reviewed-By: Thomas Hartmann

Reviewed-by: Thomas Hartmann

Fix compilation on gcc.

The new implementation is based on the QmlJS::Interpreter
meta info system and gets its info from parsing qml and qmldumper
instead of interogating QDeclarative classes.

So we share this code with the Qml TextEditor and this approach is also
way more flexible. It also work with different Qt versions.

The meta info is now bound to a document/rewriter.

The api has changed slightly.

subComponentManager: cleanup
The SubComponentManager does not have to provide meta info, anymore.

propertyParser: cleanup
Enums were never properly converted. here.

metaInfo: remove old MetaInfo classes
Removing the old MetaInfo classes and code

isContainer() is not anymore

The item library now also provides small icons for the navigator.

We need this for the new AST based meta info system

Those are needed for the Visual Editor

Reviewed-by: Christian Kamm

We should differentiate between int and real

Reviewed-by:  Christian Kamm

FileInProjectFinder implements an heuristic to find the likely source
file for an aribrary file path, e.g. in the shadow build folder or
on the device. This is useful especially for .qml files, which are
executed at runtime.

Reviewed-by: con

Fix indentation + line length.

Task-number: QTCREATORBUG-2511
Reviewed-by: Alessandro Portale

- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.

belongs to 0ab67db5

Task-number: QTCREATORBUG-2912

Task-number: QTCREATORBUG-3192

Task-number: QTCREATORBUG-3122

If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build.

Move #include directive along with matching code.

Written-by: con