summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-04-19 14:21:33 +0200
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-04-19 14:21:48 +0200
commite3bceff3ee46af6e11cd15e635cabe4eb01f1a1d (patch)
tree4877fa3c050700e86b7545ed0b9035986c8d0357 /src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
parent53425816af45809b4a23216ed49fc1e022206a52 (diff)
downloadqt-creator-e3bceff3ee46af6e11cd15e635cabe4eb01f1a1d.tar.gz
Separated child-process stdout/stderr, and seperated "our" output/errors.
So now the "Applciation Output" can distinguish between these four, and handle them appropriately.
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectruncontrol.h')
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectruncontrol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
index dcff96f392..d6fe7e1cdb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
@@ -55,8 +55,8 @@ public:
private slots:
void processExited(int exitCode);
void slotBringApplicationToForeground(qint64 pid);
- void slotAddToOutputWindow(const QString &line);
- void slotError(const QString & error);
+ void slotAddToOutputWindow(const QString &line, bool onStdErr);
+ void slotError(const QString &error, bool isError);
private:
ProjectExplorer::ApplicationLauncher m_applicationLauncher;