Merge remote-tracking branch 'origin/2.2'

Conflicts:
	src/plugins/debugger/breakhandler.cpp
	src/plugins/debugger/cdb/cdbengine.cpp

diff --cc src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 3cf7082,ceae1b8..6e432f7
--- 1/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
--- 2/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@@ -2158,12 -1824,9 +2166,12 @@@ unsigned dumpSimpleType(SymbolGroupNod
      case KT_QWidget:
          rc = dumpQWidget(v, str, specialInfoIn) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
          break;
 +    case KT_QSharedPointer:
 +        rc = dumpQSharedPointer(v, str, specialInfoIn) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
 +        break;
      case KT_StdString:
      case KT_StdWString:
-         rc = dumpStd_W_String(v, str) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
+         rc = dumpStd_W_String(v, kt, str) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
          break;
      default:
          break;

diff --cc src/plugins/debugger/cdb/cdbengine.cpp
index c1b3d2c,1ab00a7..c66fb9a
--- 1/src/plugins/debugger/cdb/cdbengine.cpp
--- 2/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@@ -761,8 -742,12 +761,12 @@@ bool CdbEngine::launchCDB(const Debugge
      case AttachExternal:
      case AttachCrashedExternal:
          arguments << QLatin1String("-p") << QString::number(sp.attachPID);
-         if (sp.startMode == AttachCrashedExternal)
+         if (sp.startMode == AttachCrashedExternal) {
              arguments << QLatin1String("-e") << sp.crashParameter << QLatin1String("-g");
 -            if (isConsole(startParameters()))
+         } else {
++            if (isCreatorConsole(startParameters(), *m_options))
+                 arguments << QLatin1String("-pr") << QLatin1String("-pb");
+         }
          break;
      default:
          *errorMessage = QString::fromLatin1("Internal error: Unsupported start mode %1.").arg(sp.startMode);

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

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