4 files changed, 5 insertions, 17 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
index 52a928863c..11ebf34799 100644
--- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -16,6 +16,6 @@ add_qt_test(tst_qthreadstorage
 ## Scopes:
 #####################################################################
 
-if(NOT ANDROID AND NOT WINRT)
+if(NOT ANDROID)
     add_subdirectory(crashonexit)
 endif()
diff --git a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
index 432c564ba1..c3eae5f7e1 100644
--- a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-!android:!winrt {
+!android {
     test.depends = crashonexit
     SUBDIRS += crashonexit
 }
diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro
index d2f21f48f0..e0725d038e 100644
--- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/test/test.pro
@@ -2,14 +2,14 @@ CONFIG += testcase
 debug_and_release {
     CONFIG(debug, debug|release) {
         TARGET = ../../debug/tst_qthreadstorage
-        !android:!winrt: TEST_HELPER_INSTALLS = ../../debug/crashonexit_helper
+        !android: TEST_HELPER_INSTALLS = ../../debug/crashonexit_helper
     } else {
         TARGET = ../../release/tst_qthreadstorage
-        !android:!winrt: TEST_HELPER_INSTALLS = ../../release/crashonexit_helper
+        !android: TEST_HELPER_INSTALLS = ../../release/crashonexit_helper
     }
 } else {
     TARGET = ../tst_qthreadstorage
-    !android:!winrt: TEST_HELPER_INSTALLS = ../crashonexit_helper
+    !android: TEST_HELPER_INSTALLS = ../crashonexit_helper
 }
 CONFIG += console
 QT = core testlib
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index 3538d90803..737cb86c01 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -180,13 +180,6 @@ void testAdoptedThreadStorageWin(void *p)
     }
     QObject::connect(QThread::currentThread(), SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 }
-#ifdef Q_OS_WINRT
-unsigned __stdcall testAdoptedThreadStorageWinRT(void *p)
-{
-    testAdoptedThreadStorageWin(p);
-    return 0;
-}
-#endif
 void *testAdoptedThreadStorageUnix(void *pointers)
 {
     testAdoptedThreadStorageWin(pointers);
@@ -204,11 +197,6 @@ void tst_QThreadStorage::adoptedThreads()
         const int state = pthread_create(&thread, 0, testAdoptedThreadStorageUnix, &pointers);
         QCOMPARE(state, 0);
         pthread_join(thread, 0);
-#elif defined Q_OS_WINRT
-        HANDLE thread;
-        thread = (HANDLE) _beginthreadex(NULL, 0, testAdoptedThreadStorageWinRT, &pointers, 0, 0);
-        QVERIFY(thread);
-        WaitForSingleObjectEx(thread, INFINITE, FALSE);
 #elif defined Q_OS_WIN
         HANDLE thread;
         thread = (HANDLE)_beginthread(testAdoptedThreadStorageWin, 0, &pointers);