From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Fri, 5 Jun 2020 09:24:37 +0200
Subject: Remove winrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.

Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'tests/benchmarks/corelib/thread')

diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
index 751fd9ce7c..b94d6ee619 100644
--- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
@@ -75,18 +75,12 @@ void NativeMutexUnlock(NativeMutexType *mutex)
 }
 #endif
 #elif defined(Q_OS_WIN)
-#  ifndef Q_OS_WINRT
-#    define _WIN32_WINNT 0x0400
-#  endif
+#  define _WIN32_WINNT 0x0400
 #  include <windows.h>
 typedef CRITICAL_SECTION NativeMutexType;
 void NativeMutexInitialize(NativeMutexType *mutex)
 {
-#ifndef Q_OS_WINRT
     InitializeCriticalSection(mutex);
-#else
-    InitializeCriticalSectionEx(mutex, 0, 0);
-#endif
 }
 void NativeMutexDestroy(NativeMutexType *mutex)
 {
-- 
cgit v1.2.3