Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
75aaeff2
Commit
75aaeff2
authored
Jan 27, 2009
by
hjk
Browse files
Fixes: immediately rebuild view if custom dumpers are selected in
optiosn
parent
5e941eec
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
75aaeff2
...
...
@@ -888,7 +888,9 @@ void DebuggerManager::executeDebuggerCommand(const QString &command)
void
DebuggerManager
::
sessionLoaded
()
{
exitDebugger
();
cleanupViews
();
setStatus
(
DebuggerProcessNotReady
);
setBusyCursor
(
false
);
loadSessionData
();
}
...
...
@@ -1092,6 +1094,28 @@ bool DebuggerManager::useFastStart() const
return
0
;
// && m_settings.m_useFastStart;
}
void
DebuggerManager
::
setUseCustomDumpers
(
bool
on
)
{
m_settings
.
m_useCustomDumpers
=
on
;
engine
()
->
setUseCustomDumpers
(
on
);
}
void
DebuggerManager
::
setUseFastStart
(
bool
on
)
{
m_settings
.
m_useFastStart
=
on
;
}
void
DebuggerManager
::
setDebugDumpers
(
bool
on
)
{
m_settings
.
m_debugDumpers
=
on
;
engine
()
->
setDebugDumpers
(
on
);
}
void
DebuggerManager
::
setSkipKnownFrames
(
bool
on
)
{
m_settings
.
m_skipKnownFrames
=
on
;
}
void
DebuggerManager
::
queryCurrentTextEditor
(
QString
*
fileName
,
int
*
lineNumber
,
QObject
**
object
)
{
...
...
src/plugins/debugger/debuggermanager.h
View file @
75aaeff2
...
...
@@ -167,8 +167,6 @@ private:
virtual
WatchHandler
*
watchHandler
()
=
0
;
virtual
void
showApplicationOutput
(
const
QString
&
data
)
=
0
;
//virtual QAction *useCustomDumpersAction() const = 0;
//virtual QAction *debugDumpersAction() const = 0;
virtual
bool
skipKnownFrames
()
const
=
0
;
virtual
bool
debugDumpers
()
const
=
0
;
virtual
bool
useCustomDumpers
()
const
=
0
;
...
...
@@ -283,6 +281,12 @@ public slots:
void
showStatusMessage
(
const
QString
&
msg
,
int
timeout
=
-
1
);
// -1 forever
void
setUseCustomDumpers
(
bool
on
);
void
setUseToolTips
(
bool
on
);
void
setDebugDumpers
(
bool
on
);
void
setSkipKnownFrames
(
bool
on
);
void
setUseFastStart
(
bool
on
);
private
slots
:
void
showDebuggerOutput
(
const
QString
&
prefix
,
const
QString
&
msg
);
void
showDebuggerInput
(
const
QString
&
prefix
,
const
QString
&
msg
);
...
...
@@ -312,9 +316,7 @@ private:
StackHandler
*
stackHandler
()
{
return
m_stackHandler
;
}
ThreadsHandler
*
threadsHandler
()
{
return
m_threadsHandler
;
}
WatchHandler
*
watchHandler
()
{
return
m_watchHandler
;
}
//QAction *useCustomDumpersAction() const { return m_useCustomDumpersAction; }
//QAction *useToolTipsAction() const { return m_useToolTipsAction; }
//QAction *debugDumpersAction() const { return m_debugDumpersAction; }
bool
skipKnownFrames
()
const
;
bool
debugDumpers
()
const
;
bool
useCustomDumpers
()
const
;
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
75aaeff2
...
...
@@ -251,6 +251,7 @@ public:
void
finish
()
{}
// automatically calls "apply"
private:
friend
class
DebuggerPlugin
;
Ui
::
GdbOptionPage
m_ui
;
DebuggerSettings
m_settings
;
...
...
@@ -300,6 +301,10 @@ QWidget *GdbOptionPage::createPage(QWidget *parent)
//m_dumpLogAction = new QAction(this);
//m_dumpLogAction->setText(tr("Dump Log File for Debugging Purposes"));
//
connect
(
m_ui
.
checkBoxUseCustomDumpers
,
SIGNAL
(
clicked
(
bool
)),
m_plugin
->
m_manager
,
SLOT
(
setUseCustomDumpers
(
bool
)));
return
w
;
}
...
...
src/plugins/debugger/gdbengine.cpp
View file @
75aaeff2
...
...
@@ -1760,14 +1760,6 @@ void GdbEngine::setDebugDumpers(bool on)
}
}
//QByteArray GdbEngine::dumperChannel() const
//{
// return m_dumperServer->serverName().toLatin1();
// //QByteArray ba;
// //ba.setNum(m_dumperServer->serverPort());
// //return ba;
//}
//////////////////////////////////////////////////////////////////////
//
...
...
@@ -2889,11 +2881,10 @@ static QString sizeofTypeExpression(const QString &type)
return
"sizeof("
+
gdbQuoteTypes
(
type
)
+
")"
;
}
void
GdbEngine
::
setCustomDumpers
Wanted
(
bool
on
)
void
GdbEngine
::
set
Use
CustomDumpers
(
bool
on
)
{
Q_UNUSED
(
on
);
// FIXME: a bit too harsh, but otherwise the treeview
// sometimes look funny
// FIXME: a bit too harsh, but otherwise the treeview sometimes look funny
//m_expandedINames.clear();
updateLocals
();
}
...
...
src/plugins/debugger/gdbengine.h
View file @
75aaeff2
...
...
@@ -134,6 +134,9 @@ private:
void
loadSymbols
(
const
QString
&
moduleName
);
void
loadAllSymbols
();
void
setDebugDumpers
(
bool
on
);
void
setUseCustomDumpers
(
bool
on
);
//
// Own stuff
//
...
...
@@ -167,9 +170,6 @@ private:
void
updateLocals
();
private
slots
:
void
setDebugDumpers
(
bool
on
);
void
setCustomDumpersWanted
(
bool
on
);
void
handleResponse
();
void
gdbProcError
(
QProcess
::
ProcessError
error
);
...
...
src/plugins/debugger/idebuggerengine.h
View file @
75aaeff2
...
...
@@ -86,6 +86,8 @@ public:
virtual
void
loadAllSymbols
()
=
0
;
virtual
void
reloadRegisters
()
=
0
;
virtual
void
setDebugDumpers
(
bool
on
)
=
0
;
virtual
void
setUseCustomDumpers
(
bool
on
)
=
0
;
};
}
// namespace Internal
...
...
src/plugins/debugger/scriptengine.h
View file @
75aaeff2
...
...
@@ -101,6 +101,9 @@ private:
void
loadSessionData
()
{}
void
saveSessionData
()
{}
void
setDebugDumpers
(
bool
)
{}
void
setUseCustomDumpers
(
bool
)
{}
void
assignValueInDebugger
(
const
QString
&
expr
,
const
QString
&
value
);
void
executeDebuggerCommand
(
const
QString
&
command
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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