Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	examples/network/network.pro
	mkspecs/features/mac/default_post.prf
	src/corelib/io/qfilesystemengine_win.cpp
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess.h
	src/corelib/io/qprocess_p.h
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/thread/qmutex.cpp
	src/platformsupport/fontdatabases/windows/windows.pri
	src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
	tests/auto/corelib/io/io.pro

Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e

1 files changed, 0 insertions, 7 deletions

diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 73448943e1..625e145647 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -341,7 +341,6 @@ bool QPMCache::insert(const QString& key, const QPixmap &pixmap, int cost)
     } else {
         //Insertion failed we released the new allocated key
         cacheKeys.remove(key);
-        releaseKey(cacheKey);
     }
     return success;
 }
@@ -355,9 +354,6 @@ QPixmapCache::Key QPMCache::insert(const QPixmap &pixmap, int cost)
             theid = startTimer(flush_time);
             t = false;
         }
-    } else {
-        //Insertion failed we released the key and return an invalid one
-        releaseKey(cacheKey);
     }
     return cacheKey;
 }
@@ -377,9 +373,6 @@ bool QPMCache::replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int
             t = false;
         }
         const_cast<QPixmapCache::Key&>(key) = cacheKey;
-    } else {
-        //Insertion failed we released the key
-        releaseKey(cacheKey);
     }
     return success;
 }