Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp

Task-number: QTCREATOR-26

By setting the window and button text colors to the tool tip text color,
since a tool tip background is drawn.

Task-number: QTCREATORBUG-322

Also avoids errors because of users messing with the "Unfiltered"
filter, which is used for e.g. context help.
The strategy now is to remove the "Unfiltered" filter from previous runs
(possibly in a different language), and re-register a fresh filter with
the name in the current language, and guaranteed to not filter out
anything.

Reviewed-by: kh1

Display the error in a label of the preferences page.
Reviewed-by: con

Task-number: QTCREATORBUG-199
Reviewed-by: thorbjorn

The paragraphs are now long lines that get wrapped by the text browser.

Reviewed-by: TrustMe

	modified:   src/plugins/bineditor/BinEditor.pluginspec
	modified:   src/plugins/bookmarks/Bookmarks.pluginspec
	modified:   src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	modified:   src/plugins/coreplugin/Core.pluginspec
	modified:   src/plugins/cpaster/CodePaster.pluginspec
	modified:   src/plugins/cppeditor/CppEditor.pluginspec
	modified:   src/plugins/cpptools/CppTools.pluginspec
	modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/debugger/Debugger.pluginspec
	modified:   src/plugins/designer/Designer.pluginspec
	modified:   src/plugins/fakevim/FakeVim.pluginspec
	modified:   src/plugins/find/Find.pluginspec
	modified:   src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/helloworld/HelloWorld.pluginspec
	modified:   src/plugins/help/Help.pluginspec
	modified:   src/plugins/locator/Locator.pluginspec
	modified:   src/plugins/mercurial/Mercurial.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec
	modified:   src/plugins/projectexplorer/ProjectExplorer.pluginspec
	modified:   src/plugins/qmleditor/QmlEditor.pluginspec
	modified:   src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	modified:   src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	modified:   src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	modified:   src/plugins/regexp/RegExp.pluginspec
	modified:   src/plugins/resourceeditor/ResourceEditor.pluginspec
	modified:   src/plugins/snippets/Snippets.pluginspec
	modified:   src/plugins/subversion/Subversion.pluginspec
	modified:   src/plugins/texteditor/TextEditor.pluginspec
	modified:   src/plugins/vcsbase/VCSBase.pluginspec
	modified:   src/plugins/welcome/Welcome.pluginspec

	modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec

Task:     QTCREATORBUG-326
Details:
The image simply needs bigger margins to avoid the shadow
beeing streched too far.

Strip buddy markers.

Added quickfix operation to split simple-declarations. E.g. int a, b; will be replaced with int a; int b;.

Reviewed-By: hjk

Add filter widget, use a special QSortFilterProxyModel +
StandardItemModel, add a slot selecting the page.
Add matches() to IOptionsPage.

Reviewed-by: Tobias Hunger <qt-info@nokia.com>

Done-with: ckamm

When constructor completion was attempted on a base class specified in a
class declaration, a null pointer reference would occur.

Task-number: QTCREATORBUG-321
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Done-with: ckamm

 * Ignore steData calls that do not actually change any data
   in the EnvironmentEditorModel. This prevents all variables
   touched from getting marked up as changed.

Reviewed-By: con

 * Export QTDIR and path to Qt binaries with native
   directory separators.

Reviewed-By: con

 * Handle SBSv2 by doing the same as for the older ABLD
   build system.

Reviewed-By: con

Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)

Conflicts:

	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h

Since the runconfiguration gets deleted anyway.