feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

add/use error channel puppet -> designer

Browse Source 
Change-Id: Id6988e604ca3a092564a3e572c03b322bc101b77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Tim Jenssen
2015-02-18 13:32:35 +01:00
committed by Thomas Hartmann
parent 93c8509a50
commit f160d2b8f5
8 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
+11 -3
View File
@@ -39,9 +39,10 @@ DebugOutputCommand::DebugOutputCommand()
{
}
DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type)
: m_text(text),
m_type(type)
DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type, const QVector<qint32> &instanceIds)
: m_instanceIds(instanceIds)
, m_text(text)
, m_type(type)
{
}
@@ -55,10 +56,16 @@ QString DebugOutputCommand::text() const
return m_text;
}
QVector<qint32> DebugOutputCommand::instanceIds() const
{
return m_instanceIds;
}
QDataStream &operator<<(QDataStream &out, const DebugOutputCommand &command)
{
out << command.type();
out << command.text();
out << command.instanceIds();
return out;
}
@@ -67,6 +74,7 @@ QDataStream &operator>>(QDataStream &in, DebugOutputCommand &command)
{
in >> command.m_type;
in >> command.m_text;
in >> command.m_instanceIds;
return in;
}