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
Marco Bubke
flatpak-qt-creator
Commits
baab8976
Commit
baab8976
authored
Jan 12, 2011
by
hjk
Browse files
debugger: QmlEngine: rename master/slave into cpp/qml
parent
ae46124a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/qml/qmlcppengine.cpp
View file @
baab8976
...
...
@@ -71,9 +71,9 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
d
->
m_activeEngine
=
d
->
m_cppEngine
;
connect
(
d
->
m_cppEngine
,
SIGNAL
(
stateChanged
(
DebuggerState
)),
SLOT
(
master
EngineStateChanged
(
DebuggerState
)));
SLOT
(
cpp
EngineStateChanged
(
DebuggerState
)));
connect
(
d
->
m_qmlEngine
,
SIGNAL
(
stateChanged
(
DebuggerState
)),
SLOT
(
slave
EngineStateChanged
(
DebuggerState
)));
SLOT
(
qml
EngineStateChanged
(
DebuggerState
)));
connect
(
Core
::
EditorManager
::
instance
(),
SIGNAL
(
currentEditorChanged
(
Core
::
IEditor
*
)),
...
...
@@ -528,23 +528,20 @@ void QmlCppEngine::setupSlaveEngine()
d
->
m_qmlEngine
->
startDebugger
(
runControl
());
}
void
QmlCppEngine
::
master
EngineStateChanged
(
const
DebuggerState
&
newState
)
void
QmlCppEngine
::
cpp
EngineStateChanged
(
const
DebuggerState
&
newState
)
{
if
(
newState
==
InferiorStopOk
)
{
if
(
newState
==
InferiorStopOk
)
setActiveEngine
(
CppLanguage
);
}
engineStateChanged
(
newState
);
}
void
QmlCppEngine
::
slave
EngineStateChanged
(
const
DebuggerState
&
newState
)
void
QmlCppEngine
::
qml
EngineStateChanged
(
const
DebuggerState
&
newState
)
{
if
(
newState
==
InferiorStopOk
)
{
if
(
newState
==
InferiorStopOk
)
setActiveEngine
(
QmlLanguage
);
}
engineStateChanged
(
newState
);
}
void
QmlCppEngine
::
engineStateChanged
(
const
DebuggerState
&
newState
)
{
switch
(
newState
)
{
...
...
src/plugins/debugger/qml/qmlcppengine.h
View file @
baab8976
...
...
@@ -104,8 +104,8 @@ protected:
virtual
void
shutdownEngine
();
private
slots
:
void
master
EngineStateChanged
(
const
DebuggerState
&
state
);
void
slave
EngineStateChanged
(
const
DebuggerState
&
state
);
void
cpp
EngineStateChanged
(
const
DebuggerState
&
state
);
void
qml
EngineStateChanged
(
const
DebuggerState
&
state
);
void
setupSlaveEngine
();
void
editorChanged
(
Core
::
IEditor
*
editor
);
...
...
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