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
4fc3990b
Commit
4fc3990b
authored
Apr 15, 2011
by
Christiaan Janssen
Browse files
QmlProfiler: fixed connection reset when new application starts
Reviewed-by: Kai Koehne
parent
4a098509
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmlprofiler/qmlprofilertool.cpp
View file @
4fc3990b
...
...
@@ -294,6 +294,7 @@ void QmlProfilerTool::connectClient()
{
QTC_ASSERT
(
!
d
->
m_client
,
return
;)
d
->
m_client
=
new
QDeclarativeDebugConnection
;
d
->
m_traceWindow
->
reset
(
d
->
m_client
);
connect
(
d
->
m_client
,
SIGNAL
(
stateChanged
(
QAbstractSocket
::
SocketState
)),
this
,
SLOT
(
connectionStateChanged
()));
d
->
m_connectionTimer
.
start
();
...
...
@@ -461,7 +462,7 @@ void QmlProfilerTool::connectionStateChanged()
{
if
(
QmlProfilerPlugin
::
debugOutput
)
qWarning
(
"QmlProfiler: connected and running"
);
resetWindow
();
updateRecordingState
();
break
;
}
case
QAbstractSocket
::
ClosingState
:
...
...
@@ -474,9 +475,8 @@ void QmlProfilerTool::connectionStateChanged()
}
}
void
QmlProfilerTool
::
resetWindow
()
void
QmlProfilerTool
::
updateRecordingState
()
{
d
->
m_traceWindow
->
reset
(
d
->
m_client
);
if
(
d
->
m_client
->
isConnected
())
{
d
->
m_traceWindow
->
setRecording
(
d
->
m_recordingEnabled
);
}
else
{
...
...
src/plugins/qmlprofiler/qmlprofilertool.h
View file @
4fc3990b
...
...
@@ -90,7 +90,7 @@ private slots:
private:
void
connectToClient
();
void
resetWindow
();
void
updateRecordingState
();
class
QmlProfilerToolPrivate
;
QmlProfilerToolPrivate
*
d
;
...
...
src/plugins/qmlprofiler/tracewindow.cpp
View file @
4fc3990b
...
...
@@ -333,7 +333,8 @@ void TraceWindow::clearDisplay()
void
TraceWindow
::
setRecording
(
bool
recording
)
{
m_plugin
.
data
()
->
setRecording
(
recording
);
if
(
m_plugin
)
m_plugin
.
data
()
->
setRecording
(
recording
);
}
bool
TraceWindow
::
isRecording
()
const
...
...
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