Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
cda5f5d6
Commit
cda5f5d6
authored
Jun 22, 2010
by
Friedemann Kleint
Browse files
Debugger: Re-enable CDB
parent
0db5e802
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/cdb/cdbcore.pri
View file @
cda5f5d6
...
...
@@ -3,8 +3,6 @@
# FIXME
CDB_PATH=""
false {
win32 {
contains(QMAKE_CXX, cl) {
...
...
@@ -54,5 +52,3 @@ LIBS+=-lpsapi
} # exists($$CDB_PATH)
} # (QMAKE_CXX, cl)
} # win32
} # false
src/plugins/debugger/cdb/cdbdebugengine.cpp
View file @
cda5f5d6
...
...
@@ -61,6 +61,7 @@
#include <texteditor/itexteditor.h>
#include <utils/savedaction.h>
#include <utils/checkablemessagebox.h>
#include <projectexplorer/toolchain.h>
#include <QtCore/QDebug>
#include <QtCore/QTimer>
...
...
@@ -206,7 +207,7 @@ void CdbDebugEnginePrivate::cleanStackTrace()
}
CdbDebugEngine
::
CdbDebugEngine
(
const
DebuggerStartParameters
&
startParameters
)
:
DebuggerEngine
(
startParamters
),
DebuggerEngine
(
startParam
e
ters
),
m_d
(
new
CdbDebugEnginePrivate
(
this
))
{
m_d
->
m_consoleStubProc
.
setMode
(
Utils
::
ConsoleProcess
::
Suspend
);
...
...
@@ -374,8 +375,8 @@ void CdbDebugEngine::startupChecks()
void
CdbDebugEngine
::
startDebugger
()
{
QTC_ASSERT
(
runControl
(),
return
);
const
DebuggerStartParameters
&
sp
=
runControl
()
->
sp
();
setState
(
EngineStarting
,
Q_FUNC_INFO
,
__LINE__
);
const
DebuggerStartParameters
&
sp
=
startParameters
();
if
(
debugCDBExecution
)
qDebug
()
<<
"startDebugger"
;
CdbCore
::
BreakPoint
::
clearNormalizeFileNameCache
();
...
...
@@ -514,7 +515,7 @@ void CdbDebugEnginePrivate::processCreatedAttached(ULONG64 processHandle, ULONG6
// the exception to be delivered to the debugger
// Also, see special handling in slotModulesLoaded().
if
(
m_mode
==
AttachCrashedExternal
)
{
const
QString
crashParameter
=
m_engine
->
runControl
()
->
sp
().
crashParameter
;
const
QString
crashParameter
=
m_engine
->
startParameters
().
crashParameter
;
if
(
!
crashParameter
.
isEmpty
())
{
ULONG64
evtNr
=
crashParameter
.
toULongLong
();
const
HRESULT
hr
=
interfaces
().
debugControl
->
SetNotifyEventHandle
(
evtNr
);
...
...
@@ -1125,7 +1126,7 @@ bool CdbDebugEnginePrivate::attemptBreakpointSynchronization(QString *errorMessa
QStringList
warnings
;
const
bool
ok
=
synchronizeBreakPoints
(
interfaces
().
debugControl
,
interfaces
().
debugSymbols
,
breakHandler
(),
m_engine
->
breakHandler
(),
errorMessage
,
&
warnings
);
if
(
const
int
warningsCount
=
warnings
.
size
())
for
(
int
w
=
0
;
w
<
warningsCount
;
w
++
)
...
...
@@ -1255,7 +1256,7 @@ void CdbDebugEngine::slotConsoleStubStarted()
QString
errorMessage
;
if
(
startAttachDebugger
(
appPid
,
AttachExternal
,
&
errorMessage
))
{
m_d
->
startWatchTimer
();
runControl
()
->
notifyInferiorPid
(
appPid
);
notifyInferiorPid
(
appPid
);
}
else
{
QMessageBox
::
critical
(
DebuggerUISwitcher
::
instance
()
->
mainWindow
(),
tr
(
"Debugger Error"
),
errorMessage
);
}
...
...
@@ -1632,6 +1633,26 @@ void addCdbOptionPages(QList<Core::IOptionsPage *> *opts)
opts
->
push_back
(
theOptionsPage
);
}
bool
checkCdbConfiguration
(
int
toolChainI
,
QString
*
errorMsg
,
QString
*
settingsPage
)
{
const
ProjectExplorer
::
ToolChain
::
ToolChainType
toolChain
=
static_cast
<
ProjectExplorer
::
ToolChain
::
ToolChainType
>
(
toolChainI
);
switch
(
toolChain
)
{
case
ProjectExplorer
::
ToolChain
::
MinGW
:
// Do our best
case
ProjectExplorer
::
ToolChain
::
MSVC
:
case
ProjectExplorer
::
ToolChain
::
WINCE
:
case
ProjectExplorer
::
ToolChain
::
OTHER
:
case
ProjectExplorer
::
ToolChain
::
UNKNOWN
:
case
ProjectExplorer
::
ToolChain
::
INVALID
:
break
;
default:
*
errorMsg
=
CdbDebugEngine
::
tr
(
"The CDB debug engine does not support the '%1"
).
arg
(
ProjectExplorer
::
ToolChain
::
toolChainName
(
toolChain
));
*
settingsPage
=
CdbOptionsPage
::
settingsId
();
return
false
;
}
return
true
;
}
}
// namespace Internal
}
// namespace Debugger
src/plugins/debugger/debuggerplugin.cpp
View file @
cda5f5d6
...
...
@@ -960,6 +960,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
m_debugMode
=
0
;
m_uiSwitcher
=
0
;
m_state
=
DebuggerNotReady
;
}
bool
DebuggerPluginPrivate
::
initialize
(
const
QStringList
&
arguments
,
QString
*
errorMessage
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment