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/thread.pri | |
| 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/thread.pri')
| -rw-r--r-- | src/corelib/thread/thread.pri | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index 2e027c8e21..3c1ddd984a 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -50,11 +50,6 @@ win32:SOURCES += thread/qmutex_win.cpp \ thread/qthread_win.cpp \ thread/qwaitcondition_win.cpp -winrt { - SOURCES -= thread/qthread_win.cpp - SOURCES += thread/qthread_winrt.cpp -} - integrity:SOURCES += thread/qmutex_unix.cpp \ thread/qthread_unix.cpp \ thread/qwaitcondition_unix.cpp |