diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-17 14:11:42 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-17 17:26:05 (GMT) |
| commit | d64c29e18cedace91bea31d83b62e5c0b6c6049e (patch) | |
| tree | 9d577988e6df0b180c286fb384cc4baf1b574e03 /src/corelib | |
| parent | face84c73a2196432020dda18755af7955d2de39 (diff) | |
| download | Qt-d64c29e18cedace91bea31d83b62e5c0b6c6049e.zip Qt-d64c29e18cedace91bea31d83b62e5c0b6c6049e.tar.gz Qt-d64c29e18cedace91bea31d83b62e5c0b6c6049e.tar.bz2 | |
Fixed QResource to respect the explicitely set locale
When using QResource directly, the loader should respect the locale that the
user asked to use for the resource.
Reviewed-by: João Abecasis
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); |