Commit 2cc89591 authored by Friedemann Kleint's avatar Friedemann Kleint

Introduce option -enable-cdb to enable CDB.

Reviewed-by: default avatarhjk <qtc-committer@nokia.com>
parent 800a48f0
......@@ -1297,7 +1297,10 @@
When building \e{Qt Creator} using the \e{Microsoft Visual C++ Compiler},
the location \c{"%ProgramFiles%\Debugging Tools for Windows"} will be checked
for the required include files.
\
\note As of version 1.2, the command line option \c{-enable-cdb} has to be passed
to Qt Creator to enable support for this engine.
\endtable
*/
......
......@@ -24,4 +24,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<dependency name="Core" version="1.1.80"/>
<dependency name="Find" version="1.1.80"/>
</dependencyList>
<argumentList>
<argument name="-enable-cdb"/>
</argumentList>
</plugin>
......@@ -148,9 +148,9 @@ extern IDebuggerEngine *createWinEngine(DebuggerManager *)
#endif
extern IDebuggerEngine *createScriptEngine(DebuggerManager *parent);
DebuggerManager::DebuggerManager()
DebuggerManager::DebuggerManager(const QStringList &arguments)
{
init();
init(arguments);
}
DebuggerManager::~DebuggerManager()
......@@ -160,7 +160,7 @@ DebuggerManager::~DebuggerManager()
delete scriptEngine;
}
void DebuggerManager::init()
void DebuggerManager::init(const QStringList &arguments)
{
m_status = -1;
m_busy = false;
......@@ -427,7 +427,8 @@ void DebuggerManager::init()
setStatus(DebuggerProcessNotReady);
gdbEngine = createGdbEngine(this);
winEngine = createWinEngine(this);
if (arguments.contains(QLatin1String("-enable-cdb")))
winEngine = createWinEngine(this);
scriptEngine = createScriptEngine(this);
setDebuggerType(GdbDebugger);
if (Debugger::Constants::Internal::debug)
......
......@@ -178,7 +178,7 @@ class DebuggerManager : public QObject,
Q_OBJECT
public:
DebuggerManager();
DebuggerManager(const QStringList &arguments);
~DebuggerManager();
IDebuggerManagerAccessForEngines *engineInterface();
......@@ -341,7 +341,7 @@ public:
bool m_useTerminal;
private:
void init();
void init(const QStringList &arguments);
void setDebuggerType(DebuggerType type);
void runTest(const QString &fileName);
QDockWidget *createDockForWidget(QWidget *widget);
......
......@@ -470,7 +470,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
Q_UNUSED(arguments);
Q_UNUSED(errorMessage);
m_manager = new DebuggerManager;
m_manager = new DebuggerManager(arguments);
ICore *core = ICore::instance();
QTC_ASSERT(core, return false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment