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
83fa3ce3
Commit
83fa3ce3
authored
Jan 12, 2011
by
hjk
Browse files
debugger: don't display slave data
parent
9912d37f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/qml/qmlcppengine.cpp
View file @
83fa3ce3
...
...
@@ -115,19 +115,8 @@ void QmlCppEngine::setActiveEngine(DebuggerLanguage language)
d
->
m_activeEngine
=
d
->
m_qmlEngine
;
updateEngine
=
true
;
}
if
(
previousEngine
!=
d
->
m_activeEngine
)
{
if
(
previousEngine
!=
d
->
m_activeEngine
)
showStatusMessage
(
tr
(
"%1 debugger activated"
).
arg
(
engineName
));
debuggerCore
()
->
displayDebugger
(
d
->
m_activeEngine
,
updateEngine
);
}
}
DebuggerLanguage
QmlCppEngine
::
activeEngine
()
const
{
if
(
d
->
m_activeEngine
==
d
->
m_cppEngine
)
return
CppLanguage
;
if
(
d
->
m_activeEngine
==
d
->
m_qmlEngine
)
return
QmlLanguage
;
return
AnyLanguage
;
}
void
QmlCppEngine
::
setToolTipExpression
(
const
QPoint
&
mousePos
,
...
...
@@ -571,7 +560,7 @@ void QmlCppEngine::engineStateChanged(const DebuggerState &newState)
break
;
case
InferiorShutdownRequested
:
if
(
activeEngine
()
==
QmlLanguag
e
)
{
if
(
d
->
m_
activeEngine
==
d
->
m_qmlEngin
e
)
{
setActiveEngine
(
CppLanguage
);
}
break
;
...
...
src/plugins/debugger/qml/qmlcppengine.h
View file @
83fa3ce3
...
...
@@ -21,7 +21,6 @@ public:
explicit
QmlCppEngine
(
const
DebuggerStartParameters
&
sp
);
virtual
~
QmlCppEngine
();
DebuggerLanguage
activeEngine
()
const
;
void
setActiveEngine
(
DebuggerLanguage
language
);
virtual
void
setToolTipExpression
(
const
QPoint
&
mousePos
,
...
...
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