summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qcache.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-18 00:14:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-18 00:14:22 (GMT)
commit7c1283fca1ef2e742b5794600e00edf0c3e3020f (patch)
treec4adc227da498e80bbadfddad3a1a837e8a15e13 /src/corelib/tools/qcache.h
parentbf819a04b0c60c64912f72b613c1546d8be7dc50 (diff)
parentd64c29e18cedace91bea31d83b62e5c0b6c6049e (diff)
downloadQt-7c1283fca1ef2e742b5794600e00edf0c3e3020f.zip
Qt-7c1283fca1ef2e742b5794600e00edf0c3e3020f.tar.gz
Qt-7c1283fca1ef2e742b5794600e00edf0c3e3020f.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
Diffstat (limited to 'src/corelib/tools/qcache.h')
0 files changed, 0 insertions, 0 deletions