feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Alessandro Portale
2009-04-15 16:41:08 +02:00
parent bccfd33dee 2cc8959114
commit 46ac6ca0af
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/qtcreator.qdoc
View File

@@ -1297,7 +1297,10 @@
When building \e{Qt Creator} using the \e{Microsoft Visual C++ Compiler}, When building \e{Qt Creator} using the \e{Microsoft Visual C++ Compiler},
the location \c{"%ProgramFiles%\Debugging Tools for Windows"} will be checked the location \c{"%ProgramFiles%\Debugging Tools for Windows"} will be checked
for the required include files. 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 \endtable
*/ */

3
src/plugins/debugger/Debugger.pluginspec
View File

@@ -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="Core" version="1.1.80"/>
<dependency name="Find" version="1.1.80"/> <dependency name="Find" version="1.1.80"/>
</dependencyList> </dependencyList>
<argumentList>
<argument name="-enable-cdb"/>
</argumentList>
</plugin> </plugin>

7
src/plugins/debugger/debuggermanager.cpp
View File

@@ -148,9 +148,9 @@ extern IDebuggerEngine *createWinEngine(DebuggerManager *)
#endif #endif
extern IDebuggerEngine *createScriptEngine(DebuggerManager *parent); extern IDebuggerEngine *createScriptEngine(DebuggerManager *parent);
DebuggerManager::DebuggerManager() DebuggerManager::DebuggerManager(const QStringList &arguments)
{ {
init(); init(arguments);
} }
DebuggerManager::~DebuggerManager() DebuggerManager::~DebuggerManager()
@@ -160,7 +160,7 @@ DebuggerManager::~DebuggerManager()
delete scriptEngine; delete scriptEngine;
} }
void DebuggerManager::init() void DebuggerManager::init(const QStringList &arguments)
{ {
m_status = -1; m_status = -1;
m_busy = false; m_busy = false;
@@ -427,6 +427,7 @@ void DebuggerManager::init()
setStatus(DebuggerProcessNotReady); setStatus(DebuggerProcessNotReady);
gdbEngine = createGdbEngine(this); gdbEngine = createGdbEngine(this);
if (arguments.contains(QLatin1String("-enable-cdb")))
winEngine = createWinEngine(this); winEngine = createWinEngine(this);
scriptEngine = createScriptEngine(this); scriptEngine = createScriptEngine(this);
setDebuggerType(GdbDebugger); setDebuggerType(GdbDebugger);

4
src/plugins/debugger/debuggermanager.h
View File

@@ -178,7 +178,7 @@ class DebuggerManager : public QObject,
Q_OBJECT Q_OBJECT
public: public:
DebuggerManager(); DebuggerManager(const QStringList &arguments);
~DebuggerManager(); ~DebuggerManager();
IDebuggerManagerAccessForEngines *engineInterface(); IDebuggerManagerAccessForEngines *engineInterface();
@@ -341,7 +341,7 @@ public:
bool m_useTerminal; bool m_useTerminal;
private: private:
void init(); void init(const QStringList &arguments);
void setDebuggerType(DebuggerType type); void setDebuggerType(DebuggerType type);
void runTest(const QString &fileName); void runTest(const QString &fileName);
QDockWidget *createDockForWidget(QWidget *widget); QDockWidget *createDockForWidget(QWidget *widget);

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -470,7 +470,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
Q_UNUSED(arguments); Q_UNUSED(arguments);
Q_UNUSED(errorMessage); Q_UNUSED(errorMessage);
m_manager = new DebuggerManager; m_manager = new DebuggerManager(arguments);
ICore *core = ICore::instance(); ICore *core = ICore::instance();
QTC_ASSERT(core, return false); QTC_ASSERT(core, return false);