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

Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp

RevBy: Daniel Molkentin <daniel.molkentin@nokia.com>

i.e., don't allow user to confuse himself :)

technically, it would be cleaner to handle that in the adapters,
but it is a lot of duplicated code without any gain.

if the respective view is enabled, the manager will request the
initial update in some unholy state, probably AdapterStarting -
when gdb isn't up yet.

the assumption is that pending breakpoints will only be resolved when
the source list changes. consequently it is pointless to update just
one of them.

there seems to be no reason for delaying the display because
of -break-list

Pointer fit into long or long long (Win64).
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Merge-request: 1954
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

this is a squashed result of some major merging messups. original authors are:

Alp Mestan <alpmestan@gmail.com>
Benjamin Poulain <benjamin.poulain@nokia.com>
Pierre Rossi <pierre.rossi@nokia.com>

Merge-request: 1954
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Using "TRK" when referring to the protocol, "App TRK" when referring to the program on the device.

Reviewed-by: Oswald Buddenhagen

... with cancel, similar to the Bluetooth connect box.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>

Also ensure that Qt4ProjectConfigWidget does not emit any signals from
it's init method.

While cross compiling from windows to maemo we build the debug helper as
.so instead of .dll, though the ifdef would always make the question
about the helpers being build return false.

Reviewed-by: dt

RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com>