diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_symbian.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 158147b..29bbe4c 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -263,9 +263,8 @@ QResourcePrivate::ensureInitialized() const if(path.startsWith(QLatin1Char(':'))) path = path.mid(1); - bool found = false; if(path.startsWith(QLatin1Char('/'))) { - found = that->load(path); + that->load(path); } else { QMutexLocker lock(resourceMutex()); QStringList searchPaths = *resourceSearchPaths(); @@ -273,7 +272,6 @@ QResourcePrivate::ensureInitialized() const for(int i = 0; i < searchPaths.size(); ++i) { const QString searchPath(searchPaths.at(i) + QLatin1Char('/') + path); if(that->load(searchPath)) { - found = true; that->absoluteFilePath = QLatin1Char(':') + searchPath; break; } diff --git a/src/corelib/kernel/qsharedmemory_symbian.cpp b/src/corelib/kernel/qsharedmemory_symbian.cpp index d05f9f3..f564391 100644 --- a/src/corelib/kernel/qsharedmemory_symbian.cpp +++ b/src/corelib/kernel/qsharedmemory_symbian.cpp @@ -134,8 +134,6 @@ bool QSharedMemoryPrivate::create(int size) bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) { // Grab a pointer to the memory block - TBool readOnly = (mode == QSharedMemory::ReadOnly ? true : false); - if (!chunk.Handle()) { QString function = QLatin1String("QSharedMemory::handle"); QString safeKey = makePlatformSafeKey(key); |