diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 08:01:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 08:01:24 (GMT) |
| commit | 53b778b454b46e0ace841c3fe87b534cd82309dd (patch) | |
| tree | 8e150a3bd299cb723671e1cd7c232b90f7527dbd /src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | |
| parent | 7c302ddbfd6f048a8492fd7a75c4d759786246a4 (diff) | |
| parent | f587dfeaa9d369235d347af3d14339054ee59908 (diff) | |
| download | Qt-53b778b454b46e0ace841c3fe87b534cd82309dd.zip Qt-53b778b454b46e0ace841c3fe87b534cd82309dd.tar.gz Qt-53b778b454b46e0ace841c3fe87b534cd82309dd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix multithreaded use of bearer management on Symbian.
Fix up cancelling of active object.
Fix locking after merge from Qt Mobility.
Diffstat (limited to 'src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp')
0 files changed, 0 insertions, 0 deletions