diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 09:59:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-01 09:59:28 +0000 |
| commit | 0698f876ca02b85c1e584b72cac3444796f6a355 (patch) | |
| tree | 022748fb34278fb455d8e029d912dfb0b545f443 /src/corelib/thread/qthread_p.h | |
| parent | cd297f99a2ce9c53c3ac4633bdf2425af364a1bc (diff) | |
| parent | 0aa2d318b1524cdab42ab9988270779ddcc1922a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
| -rw-r--r-- | src/corelib/thread/qthread_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 2008f76621..1ecd682ad1 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -171,19 +171,10 @@ public: #endif // Q_OS_UNIX #ifdef Q_OS_WIN -# ifndef Q_OS_WINRT static unsigned int __stdcall start(void *); static void finish(void *, bool lockAnyway=true); -# else - HRESULT start(ABI::Windows::Foundation::IAsyncAction *); - void finish(bool lockAnyway = true); -# endif -# ifndef Q_OS_WINRT Qt::HANDLE handle; -# else - ABI::Windows::Foundation::IAsyncAction *handle; -# endif unsigned int id; int waiters; bool terminationEnabled, terminatePending; |