diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
| commit | 50ea2454c0ad9b28be6dd5125c74466f0f96d16a (patch) | |
| tree | 610e8b4852bca7d23ec5c4b9937a119eed96a124 /src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp | |
| parent | 0f750aec4507fffc06acea46a513c6d374564d6a (diff) | |
| parent | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (diff) | |
| download | Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.zip Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.gz Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp index 1c91c34..ac32081 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp +++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp @@ -109,6 +109,12 @@ void QmlOstPlugin::disconnect() d->protocol = 0; } +bool QmlOstPlugin::waitForMessage() +{ + Q_D(QmlOstPlugin); + return d->protocol->waitForReadyRead(-1); +} + void QmlOstPlugin::setPort(int port, bool block) { Q_UNUSED(port); |