Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/debugger/cdb/cdbdebugengine.cpp
	src/plugins/debugger/cdb/cdbdumperhelper.cpp
	src/plugins/debugger/gdb/gdbengine.cpp

diff --cc src/plugins/debugger/cdb/cdbdumperhelper.h
Simple merge

diff --cc src/plugins/debugger/cdb/cdboptions.cpp
Simple merge

diff --cc src/plugins/debugger/cdb/cdboptions.h
index 97f08d1,0428341..43151ae
--- 1/src/plugins/debugger/cdb/cdboptions.h
--- 2/src/plugins/debugger/cdb/cdboptions.h
+++ b/src/plugins/debugger/cdb/cdboptions.h
@@@ -51,17 -51,10 +51,18 @@@ public
      // A set of flags for comparison function.
      enum ChangeFlags { InitializationOptionsChanged = 0x1,
                         DebuggerPathsChanged = 0x2,
-                        SymbolOptionsChanged = 0x4 };
+                        SymbolOptionsChanged = 0x4,
+                        FastLoadDebuggingHelpersChanged = 0x8 };
      unsigned compare(const CdbOptions &s) const;
  
 +    // Format a symbol server specification with a cache directory
 +    static QString symbolServerPath(const QString &cacheDir);
 +    // Check whether the path is a symbol server specification and return the cache directory
 +    static bool isSymbolServerPath(const QString &symbolPath, QString *cacheDir = 0);
 +    static int indexOfSymbolServerPath(const QStringList &symbolPaths, QString *cacheDir = 0);
 +
 +    static QString settingsGroup();
 +
      bool enabled;
      QString path;
      QStringList symbolPaths;

diff --cc src/plugins/debugger/cdb/cdboptionspage.cpp
Simple merge

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