Merge branch '1.0.0' into master

Conflicts:
	src/plugins/debugger/gdbengine.cpp

diff --cc src/plugins/coreplugin/coreconstants.h
Simple merge

diff --cc src/plugins/coreplugin/mainwindow.cpp
Simple merge

diff --cc src/plugins/debugger/gdbengine.cpp
index ff4d4eb,5e0bad8..f73fc56
--- 1/src/plugins/debugger/gdbengine.cpp
--- 2/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@@ -1104,40 -1129,6 +1117,40 @@@ static bool isStoppedReason(const QStri
      ;
  }
  
-     QTimer::singleShot(0, this, SLOT(attemptBreakpointSynchronization()));
 +void GdbEngine::handleAqcuiredInferior()
 +{
 +    #if defined(Q_OS_WIN)
 +    sendCommand("info thread", GdbInfoThreads);
 +    #endif
 +    #if defined(Q_OS_LINUX)
 +    sendCommand("info proc", GdbInfoProc);
 +    #endif
 +    #if defined(Q_OS_MAC)
 +    sendCommand("info pid", GdbInfoProc, QVariant(), NeedsStop);
 +    #endif
 +    reloadSourceFiles();
 +    tryLoadCustomDumpers();
 +
 +    // intentionally after tryLoadCustomDumpers(),
 +    // otherwise we'd interupt solib loading.
 +    if (qq->wantsAllPluginBreakpoints()) {
 +        sendCommand("set auto-solib-add on");
 +        sendCommand("set stop-on-solib-events 0");
 +        sendCommand("sharedlibrary .*");
 +    } else if (qq->wantsSelectedPluginBreakpoints()) {
 +        sendCommand("set auto-solib-add on");
 +        sendCommand("set stop-on-solib-events 1");
 +        sendCommand("sharedlibrary " + qq->selectedPluginBreakpointsPattern());
 +    } else if (qq->wantsNoPluginBreakpoints()) {
 +        // should be like that already
 +        sendCommand("set auto-solib-add off");
 +        sendCommand("set stop-on-solib-events 0");
 +    }
 +    // nicer to see a bit of the world we live in
 +    reloadModules();
++    attemptBreakpointSynchronization();
 +}
 +
  void GdbEngine::handleAsyncOutput(const GdbMi &data)
  {
      const QString reason = data.findChild("reason").data();
@@@ -1172,12 -1163,44 +1185,12 @@@
  
          qq->notifyInferiorStopped();
          m_waitingForFirstBreakpointToBeHit = false;
 -        //
 -        // that's the "early stop"
 -        //  
 -        #if defined(Q_OS_WIN)
 -        sendCommand("info thread", GdbInfoThreads);
 -        #endif
 -        #if defined(Q_OS_LINUX)
 -        sendCommand("info proc", GdbInfoProc);
 -        #endif
 -        #if defined(Q_OS_MAC)
 -        sendCommand("info pid", GdbInfoProc);
 -        #endif
 -        reloadSourceFiles();
 -        tryLoadCustomDumpers();
 -
 -              #ifndef Q_OS_MAC
 -        // intentionally after tryLoadCustomDumpers(),
 -        // otherwise we'd interupt solib loading.
 -        if (qq->wantsAllPluginBreakpoints()) {
 -            sendCommand("set auto-solib-add on");
 -            sendCommand("set stop-on-solib-events 0");
 -            sendCommand("sharedlibrary .*");
 -        } else if (qq->wantsSelectedPluginBreakpoints()) {
 -            sendCommand("set auto-solib-add on");
 -            sendCommand("set stop-on-solib-events 1");
 -            sendCommand("sharedlibrary "+qq->selectedPluginBreakpointsPattern());
 -        } else if (qq->wantsNoPluginBreakpoints()) {
 -            // should be like that already
 -            sendCommand("set auto-solib-add off");
 -            sendCommand("set stop-on-solib-events 0");
 -        }
 -        #endif
 -        // nicer to see a bit of the world we live in
 -        reloadModules();
+         // this will "continue" if done
+         m_waitingForBreakpointSynchronizationToContinue = true;
 -        //QTimer::singleShot(0, this, SLOT(attemptBreakpointSynchronization()));
 -        attemptBreakpointSynchronization();
 +        //
 +        // that's the "early stop"
 +        //
 +        handleAqcuiredInferior();
-         // this will "continue" if done
-         m_waitingForBreakpointSynchronizationToContinue = true;
          return;
      }
  
@@@ -1641,10 -1665,13 +1660,12 @@@ bool GdbEngine::startDebugger(
          #ifdef Q_OS_MAC
          sendCommand("sharedlibrary apply-load-rules all");
          #endif
 -        //setTokenBarrier();
          if (!q->m_processArgs.isEmpty())
              sendCommand("-exec-arguments " + q->m_processArgs.join(" "));
+         #ifndef Q_OS_MAC
          sendCommand("set auto-solib-add off");
 -        sendCommand("x/2i " + startSymbolName(), GdbStart);
+         #endif
 +        sendCommand("info target", GdbStart);
      }
  
      // set all to "pending"

diff --cc src/plugins/debugger/gdbengine.h
Simple merge

diff --cc src/plugins/fakevim/fakevimplugin.cpp
Simple merge

diff --cc src/plugins/git/gitconstants.h
Simple merge

diff --cc src/plugins/perforce/perforceplugin.cpp
Simple merge

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

diff --cc src/plugins/projectexplorer/projectexplorerconstants.h
Simple merge