Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/io/qprocess_win.cpp
	src/widgets/itemviews/qheaderview.cpp

Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761

1 files changed, 7 insertions, 5 deletions

diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp
index 7255414bdc..03dc5fc660 100644
--- a/src/corelib/io/qlockfile_unix.cpp
+++ b/src/corelib/io/qlockfile_unix.cpp
@@ -151,12 +151,14 @@ static bool fcntlWorksAfterFlock(const QString &fn)
     if (fcntlOK.isDestroyed())
         return QLockFilePrivate::checkFcntlWorksAfterFlock(fn);
     bool *worksPtr = fcntlOK->object(fn);
-    if (!worksPtr) {
-        worksPtr = new bool(QLockFilePrivate::checkFcntlWorksAfterFlock(fn));
-        fcntlOK->insert(fn, worksPtr);
-    }
+    if (worksPtr)
+        return *worksPtr;
+
+    const bool val = QLockFilePrivate::checkFcntlWorksAfterFlock(fn);
+    worksPtr = new bool(val);
+    fcntlOK->insert(fn, worksPtr);
 
-    return *worksPtr;
+    return val;
 }
 
 static bool setNativeLocks(const QString &fileName, int fd)