diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 09:33:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 09:33:39 (GMT) |
| commit | e053119de55be1747f98d15a7871d5bcba2648b6 (patch) | |
| tree | 401a3a9f36bb3850c7d82fd85f131ddd9d012826 /src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp | |
| parent | d779f70e3012e85bee42e974afe6bfc7320d8302 (diff) | |
| parent | 8d01c4a29b6b07a52f0aead33f108dac9e298a14 (diff) | |
| download | Qt-e053119de55be1747f98d15a7871d5bcba2648b6.zip Qt-e053119de55be1747f98d15a7871d5bcba2648b6.tar.gz Qt-e053119de55be1747f98d15a7871d5bcba2648b6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFileSystemWatcher: don't try to stop non-running thread
Fix QSettings auto test to use QTRY_VERIFY
tst_QFileSystemWatcher: Don't exit the event loop on first signal.
QPollingFileSystemWatcherEngine: Fix double report of directory change.
QKqueueFileSystemWatcherEngine: Use higher file descriptors.
QKqueueFileSystemWatcherEngine: Unlock mutex between two events.
QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions