diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 00:14:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 00:14:22 (GMT) |
| commit | 7c1283fca1ef2e742b5794600e00edf0c3e3020f (patch) | |
| tree | c4adc227da498e80bbadfddad3a1a837e8a15e13 /src/corelib | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| parent | d64c29e18cedace91bea31d83b62e5c0b6c6049e (diff) | |
| download | Qt-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')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 5c543d4..a061ad1 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -273,7 +273,7 @@ QResourcePrivate::load(const QString &file) QString cleaned = cleanPath(file); for(int i = 0; i < list->size(); ++i) { QResourceRoot *res = list->at(i); - const int node = res->findNode(cleaned); + const int node = res->findNode(cleaned, locale); if(node != -1) { if(related.isEmpty()) { container = res->isContainer(node); |