diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 22:09:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 22:09:43 (GMT) |
| commit | 774a8ff7444001917287524ac57d370c6995dea0 (patch) | |
| tree | 9adc84541d1fbe9226e08871979874422c253918 /src/corelib/io/qurl.h | |
| parent | 3fa2a510aae1e0c5e18f3b6962c54fae92f3d176 (diff) | |
| parent | 360f596183969a4c690c77df08d94101428c97c0 (diff) | |
| download | Qt-774a8ff7444001917287524ac57d370c6995dea0.zip Qt-774a8ff7444001917287524ac57d370c6995dea0.tar.gz Qt-774a8ff7444001917287524ac57d370c6995dea0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
optimize ligatureHelper by using qBinaryFind instead of the for loop
QFileSystemWatcher: Do not require QApplication in the destructor.
Do not define METHOD if QT_NO_KEYWORD is defined.
QThreadPrivate::finish should not keep mutex locked when calling signals
Make QThreadStorage supports value type and not only pointers.
QThreadStorage: fix memory leak if thread storage are added while destroying
Compile fix.
Fix some warnings on Mac
Diffstat (limited to 'src/corelib/io/qurl.h')
0 files changed, 0 insertions, 0 deletions