diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-06-10 12:48:17 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-06-23 05:47:14 +0000 |
| commit | bf24838c3344f009f9fe40f596a4eab798f071b3 (patch) | |
| tree | a946c012f36cb037a9f412ebe0fbafea0f949094 /src/winmain | |
| parent | 4ce05c608410f2574e92bc6c65ad5c830b66b12f (diff) | |
| download | qtbase-bf24838c3344f009f9fe40f596a4eab798f071b3.tar.gz | |
Use qthread_win.cpp for WinRT as well
Since of Windows (Phone) 8.1 most of the desktop's thread functionality
is also available, so we might be able to share the code and get rid of
the extra implementation for WinRT.
Task-number: QTBUG-43837
Change-Id: I0ce907cd94899834527f88c70e1e395bafdb14b3
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'src/winmain')
| -rw-r--r-- | src/winmain/qtmain_winrt.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index e68da520e7..141e3ed135 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -67,7 +67,6 @@ extern "C" { #include <qvector.h> #include <qdir.h> #include <qstandardpaths.h> -#include <qthread.h> #include <wrl.h> #include <Windows.ApplicationModel.core.h> @@ -276,9 +275,6 @@ int __stdcall WinMain(HINSTANCE, HINSTANCE, LPSTR, int) if (FAILED(RoInitialize(RO_INIT_MULTITHREADED))) return 1; - // Mark the main thread - QThread::currentThread(); - Core::ICoreApplication *appFactory; if (FAILED(RoGetActivationFactory(qHString(CoreApplicationClass), IID_PPV_ARGS(&appFactory)))) return 2; |