Merge remote branch 'origin/2.2'

Conflicts:
	src/plugins/debugger/disassembleragent.cpp

diff --cc src/plugins/debugger/debuggerengine.cpp
Simple merge

diff --cc src/plugins/debugger/debuggersourcepathmappingwidget.cpp
Simple merge

diff --cc src/plugins/debugger/disassembleragent.cpp
index 897c49a,5b354aa..38ea07e
--- 1/src/plugins/debugger/disassembleragent.cpp
--- 2/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@@ -91,11 -123,10 +92,12 @@@ public
  DisassemblerAgentPrivate::DisassemblerAgentPrivate()
    : editor(0),
      tryMixed(true),
-     mimeType(_("text/x-qtcreator-generic-asm"))
 -    locationMark(new LocationMark2),
+     mimeType(_("text/x-qtcreator-generic-asm")),
+     m_resetLocationScheduled(false)
  {
 +    locationMark = new ITextMark;
 +    locationMark->setIcon(debuggerCore()->locationMarkIcon());
 +    locationMark->setPriority(TextEditor::ITextMark::HighPriority);
  }
  
  DisassemblerAgentPrivate::~DisassemblerAgentPrivate()

diff --cc src/plugins/projectexplorer/projectexplorer.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
Simple merge