diff options
Diffstat (limited to 'src/corelib/thread/qfutureinterface.cpp')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index c62b8fd36b..dfbed5fb0f 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -39,15 +39,16 @@ // qfutureinterface.h included from qfuture.h #include "qfuture.h" - -#ifndef QT_NO_QFUTURE - #include "qfutureinterface_p.h" #include <QtCore/qatomic.h> #include <QtCore/qthread.h> #include <private/qthreadpool_p.h> +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE enum { @@ -604,5 +605,3 @@ void QFutureInterfaceBasePrivate::setState(QFutureInterfaceBase::State newState) } QT_END_NAMESPACE - -#endif // QT_NO_QFUTURE |