summaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-05-16 08:25:07 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-16 08:25:07 (GMT)
commit91bf24d44690a643d7cb74ab594da949b9e51e1b (patch)
tree2cb20fdccd88afd647cfe9ecd8e97a98a14bb6e1 /src/plugins/qmltooling/qmldbg_ost/qostdevice.h
parenta363fad3f45335c6f03108a0ece5472901aa970f (diff)
parent7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff)
downloadQt-91bf24d44690a643d7cb74ab594da949b9e51e1b.zip
Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.gz
Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.bz2
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_ost/qostdevice.h')
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qostdevice.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
index 2c26ff7..200e607 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
@@ -61,10 +61,12 @@ public:
bool open(int ostProtocolId);
void close();
+ bool waitForReadyRead(int msecs);
+ qint64 bytesAvailable() const;
+
protected:
qint64 readData(char *data, qint64 maxSize);
qint64 writeData(const char *data, qint64 maxSize);
- qint64 bytesAvailable() const;
private:
QOstDevicePrivate* d_ptr;