diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-24 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-24 01:00:08 +0200 |
| commit | b29505bb3792f72ec0bd761ccfa3084b9bbf7b4c (patch) | |
| tree | 95a2a5a35c6485d818f05d47116cf652cd1ae9a6 /src/gui/opengl/qopenglprogrambinarycache.cpp | |
| parent | 536cab1a93850c80e18f44872ecca7decdeb7eea (diff) | |
| parent | 96ff6e8ebe80215a0d35055c7382bb1cf58fc660 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I60bb714ef11bced075d94addb74d23c3a3975519
Diffstat (limited to 'src/gui/opengl/qopenglprogrambinarycache.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglprogrambinarycache.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp index 40237b9935..c3fb375a20 100644 --- a/src/gui/opengl/qopenglprogrambinarycache.cpp +++ b/src/gui/opengl/qopenglprogrambinarycache.cpp @@ -264,10 +264,8 @@ public: bool QOpenGLProgramBinaryCache::load(const QByteArray &cacheKey, uint programId) { QMutexLocker lock(&m_mutex); - if (m_memCache.contains(cacheKey)) { - const MemCacheEntry *e = m_memCache[cacheKey]; + if (const MemCacheEntry *e = m_memCache.object(cacheKey)) return setProgramBinary(programId, e->format, e->blob.constData(), e->blob.size()); - } QByteArray buf; const QString fn = cacheFileName(cacheKey); |