From 36c88ba5fbfade95ee137e6c0c9bf1e2f443ebd3 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 19 Feb 2018 15:37:39 +0100
Subject: [PATCH] Fix Utils::withNTFSPermissions with void function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix up of 9467ed42c3661c13494731e0f13ce0ba5f1dc7be

Change-Id: I24343e5e1440210188742332ec6f725af3412100
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/libs/utils/fileutils.cpp | 10 ++++++++++
 src/libs/utils/fileutils.h   |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 160d1b9deaa..f7b9935465a 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -792,6 +792,16 @@ QTextStream &operator<<(QTextStream &s, const FileName &fn)
     return s << fn.toString();
 }
 
+#ifdef Q_OS_WIN
+template <>
+void withNTFSPermissions(const std::function<void()> &task)
+{
+    qt_ntfs_permission_lookup++;
+    task();
+    qt_ntfs_permission_lookup--;
+}
+#endif
+
 } // namespace Utils
 
 QT_BEGIN_NAMESPACE
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index 3fccf41f31d..d3c4044eba3 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -133,7 +133,7 @@ public:
 #ifdef Q_OS_WIN
 
 template <typename T>
-static T withNTFSPermissions(const std::function<T()> &task)
+T withNTFSPermissions(const std::function<T()> &task)
 {
     qt_ntfs_permission_lookup++;
     T result = task();
@@ -141,10 +141,13 @@ static T withNTFSPermissions(const std::function<T()> &task)
     return result;
 }
 
+template <>
+QTCREATOR_UTILS_EXPORT void withNTFSPermissions(const std::function<void()> &task);
+
 #else // Q_OS_WIN
 
 template <typename T>
-static T withNTFSPermissions(const std::function<T()> &task)
+T withNTFSPermissions(const std::function<T()> &task)
 {
     return task();
 }