diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/concurrent/qfutureinterface.cpp | 4 | ||||
| -rw-r--r-- | src/concurrent/qfuturesynchronizer.h | 6 | ||||
| -rw-r--r-- | src/concurrent/qfuturewatcher.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/concurrent/qfutureinterface.cpp b/src/concurrent/qfutureinterface.cpp index 9a273a1076..0836ad029a 100644 --- a/src/concurrent/qfutureinterface.cpp +++ b/src/concurrent/qfutureinterface.cpp @@ -44,13 +44,13 @@ #ifndef QT_NO_QFUTURE +#include "qfutureinterface_p.h" + #include <QtCore/qatomic.h> #include <QtCore/qthread.h> #include <QtCore/qthreadpool.h> #include <private/qthreadpool_p.h> -#include "qfutureinterface_p.h" - QT_BEGIN_NAMESPACE enum { diff --git a/src/concurrent/qfuturesynchronizer.h b/src/concurrent/qfuturesynchronizer.h index 3106dd44ac..36208d7a35 100644 --- a/src/concurrent/qfuturesynchronizer.h +++ b/src/concurrent/qfuturesynchronizer.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QFUTRUESYNCHRONIZER_H -#define QFUTRUESYNCHRONIZER_H +#ifndef QFUTURESYNCHRONIZER_H +#define QFUTURESYNCHRONIZER_H #include <QtConcurrent/qtconcurrent_global.h> @@ -119,4 +119,4 @@ QT_END_HEADER #endif // QT_NO_CONCURRENT -#endif // QFUTRUESYNCHRONIZER_H +#endif // QFUTURESYNCHRONIZER_H diff --git a/src/concurrent/qfuturewatcher.cpp b/src/concurrent/qfuturewatcher.cpp index eb5fb0e18d..081b21cdd3 100644 --- a/src/concurrent/qfuturewatcher.cpp +++ b/src/concurrent/qfuturewatcher.cpp @@ -43,13 +43,13 @@ #ifndef QT_NO_QFUTURE +#include "qfuturewatcher_p.h" + #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qmetaobject.h> #include <QtCore/qthread.h> -#include "qfuturewatcher_p.h" - QT_BEGIN_NAMESPACE /*! \class QFutureWatcher |