diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 12:05:48 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 09:17:06 +0000 |
commit | 152033bec09c8a57b46a01488cff1a88ca61da33 (patch) | |
tree | 3c3c7695fc362d9bec0226006257aec7afc09164 /src/corelib/thread/thread.pri | |
parent | f76e3712f1553e02259835923274de2d11b76315 (diff) |
Make QT_NO_FUTURE a feature
... and make sure we can compile without it. In particular,
Qt Concurrent depends on QFuture, so we specify it as a condition,
and QtConcurrentException should not depend on future but on
concurrent.
Change-Id: I65b158021cecb19f227554cc8b5df7a139fbfe78
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/thread/thread.pri')
-rw-r--r-- | src/corelib/thread/thread.pri | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index a4cb2478c6..e4972a57b3 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -10,12 +10,6 @@ HEADERS += thread/qmutex.h \ thread/qthreadstorage.h \ thread/qwaitcondition.h \ thread/qatomic.h \ - thread/qexception.h \ - thread/qresultstore.h \ - thread/qfuture.h \ - thread/qfutureinterface.h \ - thread/qfuturesynchronizer.h \ - thread/qfuturewatcher.h \ thread/qbasicatomic.h \ thread/qgenericatomic.h @@ -23,18 +17,12 @@ HEADERS += thread/qmutex.h \ HEADERS += thread/qmutex_p.h \ thread/qmutexpool_p.h \ thread/qfutex_p.h \ - thread/qfutureinterface_p.h \ - thread/qfuturewatcher_p.h \ thread/qorderedmutexlocker_p.h \ thread/qreadwritelock_p.h \ thread/qthread_p.h \ thread/qthreadpool_p.h SOURCES += thread/qatomic.cpp \ - thread/qexception.cpp \ - thread/qresultstore.cpp \ - thread/qfutureinterface.cpp \ - thread/qfuturewatcher.cpp \ thread/qmutex.cpp \ thread/qreadwritelock.cpp \ thread/qrunnable.cpp \ @@ -44,6 +32,24 @@ SOURCES += thread/qatomic.cpp \ thread/qthreadpool.cpp \ thread/qthreadstorage.cpp +qtConfig(future) { + HEADERS += \ + thread/qexception.h \ + thread/qfuture.h \ + thread/qfutureinterface.h \ + thread/qfutureinterface_p.h \ + thread/qfuturesynchronizer.h \ + thread/qfuturewatcher.h \ + thread/qfuturewatcher_p.h \ + thread/qresultstore.h + + SOURCES += \ + thread/qexception.cpp \ + thread/qfutureinterface.cpp \ + thread/qfuturewatcher.cpp \ + thread/qresultstore.cpp +} + win32 { SOURCES += \ thread/qmutex_win.cpp \ |