diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-06-29 12:25:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 04:46:50 +0200 |
| commit | 432a48b8f2d9ebaef1bd7be4a168a45524faaf68 (patch) | |
| tree | de7ff211c9e1b3b2bd0156b464bacbfbea475a1d /src/qml/qml/ftw | |
| parent | 9bc216f6fa34484bf582cbc3ccd2bb7b45826bc7 (diff) | |
Support remote import paths
Probe for installed modules in import path elements which are not local
to the machine. Note that all local paths in the import path list will
be tried before any remote locations are probed.
Task-number: QTBUG-21386
Change-Id: I4f7b9e54e54c1d62a5e7cb7f059ee1e9319ef054
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/ftw')
| -rw-r--r-- | src/qml/qml/ftw/qqmlthread.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/ftw/qqmlthread_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp index 423012b934..054d4850b8 100644 --- a/src/qml/qml/ftw/qqmlthread.cpp +++ b/src/qml/qml/ftw/qqmlthread.cpp @@ -235,6 +235,11 @@ void QQmlThread::shutdown() d->QThread::wait(); } +bool QQmlThread::isShutdown() const +{ + return d->m_shutdown; +} + void QQmlThread::lock() { d->lock(); diff --git a/src/qml/qml/ftw/qqmlthread_p.h b/src/qml/qml/ftw/qqmlthread_p.h index 8a0ec6ceaa..131cb4db48 100644 --- a/src/qml/qml/ftw/qqmlthread_p.h +++ b/src/qml/qml/ftw/qqmlthread_p.h @@ -69,6 +69,7 @@ public: QQmlThread(); virtual ~QQmlThread(); void shutdown(); + bool isShutdown() const; void lock(); void unlock(); |