Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
b4d6a5ba
Commit
b4d6a5ba
authored
Jan 07, 2011
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: fix qml output channeling
parent
a7eccce7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
13 deletions
+7
-13
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlengine.cpp
+4
-11
src/plugins/debugger/qml/qmlengine.h
src/plugins/debugger/qml/qmlengine.h
+3
-2
No files found.
src/plugins/debugger/qml/qmlengine.cpp
View file @
b4d6a5ba
...
...
@@ -198,10 +198,8 @@ void QmlEngine::setupInferior()
}
else
{
connect
(
&
d
->
m_applicationLauncher
,
SIGNAL
(
processExited
(
int
)),
SLOT
(
disconnected
()));
connect
(
&
d
->
m_applicationLauncher
,
SIGNAL
(
appendMessage
(
QString
,
bool
)),
SLOT
(
appendMessage
(
QString
,
bool
)));
connect
(
&
d
->
m_applicationLauncher
,
SIGNAL
(
appendOutput
(
QString
,
bool
)),
SLOT
(
appendOutput
(
QString
,
bool
)));
connect
(
&
d
->
m_applicationLauncher
,
SIGNAL
(
appendMessage
(
QString
,
ProjectExplorer
::
OutputFormat
)),
SLOT
(
appendMessage
(
QString
,
ProjectExplorer
::
OutputFormat
)));
connect
(
&
d
->
m_applicationLauncher
,
SIGNAL
(
bringToForegroundRequested
(
qint64
)),
runControl
(),
SLOT
(
bringApplicationToForeground
(
qint64
)));
...
...
@@ -212,14 +210,9 @@ void QmlEngine::setupInferior()
}
}
void
QmlEngine
::
appendMessage
(
const
QString
&
msg
,
bool
)
void
QmlEngine
::
appendMessage
(
const
QString
&
msg
,
ProjectExplorer
::
OutputFormat
format
)
{
showMessage
(
msg
,
AppStuff
);
}
void
QmlEngine
::
appendOutput
(
const
QString
&
msg
,
bool
)
{
showMessage
(
msg
,
AppOutput
);
showMessage
(
msg
,
AppStuff
);
// FIXME: Redirect to RunControl
}
void
QmlEngine
::
connectionEstablished
()
...
...
src/plugins/debugger/qml/qmlengine.h
View file @
b4d6a5ba
...
...
@@ -36,6 +36,8 @@
#include "debuggerengine.h"
#include <projectexplorer/outputformat.h>
#include <QtCore/QScopedPointer>
#include <QtNetwork/QAbstractSocket>
...
...
@@ -123,8 +125,7 @@ private slots:
void
connectionStartupFailed
();
void
connectionError
(
QAbstractSocket
::
SocketError
error
);
void
serviceConnectionError
(
const
QString
&
service
);
void
appendMessage
(
const
QString
&
msg
,
bool
);
void
appendOutput
(
const
QString
&
msg
,
bool
);
void
appendMessage
(
const
QString
&
msg
,
ProjectExplorer
::
OutputFormat
);
private:
void
expandObject
(
const
QByteArray
&
iname
,
quint64
objectId
);
...
...
Write
Preview
Markdown
is supported
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