diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-09-21 16:21:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | f7a33ec29f1278f6937f1862e002a3f8f60a4728 (patch) | |
| tree | 2246be806e15b83efbe1ac5c75f871743d2bbd1f /src/concurrent | |
| parent | a65a98399bf45924eb4d9394cf1e905b489639cc (diff) | |
QFuture: remove unused include
qtconcurrentcompilertest.h defines the HasResultType<> template, which
qfuture.h doesn't use.
Include qtconcurrentcompilertest.h in the headers which actually use
HasResultType<> instead.
Change-Id: Ic5939ccf4c9058b2b624432c7ea48a5aca2236b5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/qfuture.h | 1 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 2 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentrun.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/concurrent/qfuture.h b/src/concurrent/qfuture.h index bf40f36bc1..3a9fd64bb8 100644 --- a/src/concurrent/qfuture.h +++ b/src/concurrent/qfuture.h @@ -48,7 +48,6 @@ #include <QtConcurrent/qfutureinterface.h> #include <QtCore/qstring.h> -#include <QtConcurrent/qtconcurrentcompilertest.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 1a79562be4..59a29d4653 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -42,7 +42,7 @@ #ifndef QTCONCURRENT_FUNCTIONWRAPPERS_H #define QTCONCURRENT_FUNCTIONWRAPPERS_H -#include <QtConcurrent/qtconcurrent_global.h> +#include <QtConcurrent/qtconcurrentcompilertest.h> #ifndef QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index ce193a0e50..452c869948 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -43,7 +43,7 @@ #ifndef QTCONCURRENT_RUN_H #define QTCONCURRENT_RUN_H -#include <QtConcurrent/qtconcurrent_global.h> +#include <QtConcurrent/qtconcurrentcompilertest.h> #ifndef QT_NO_CONCURRENT |