diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 3 | ||||
-rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 3 | ||||
-rw-r--r-- | src/corelib/kernel/qcoreapplication_platform.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 29f58de8e7..a3ef59f379 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -45,9 +45,6 @@ #ifndef QT_NO_QOBJECT #include <QtCore/qcoreevent.h> #include <QtCore/qeventloop.h> -#if QT_CONFIG(future) -#include <QtCore/qfuture.h> -#endif #include <QtCore/qobject.h> #else #include <QtCore/qscopedpointer.h> diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 1aa15a7faa..1c3891927d 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -62,9 +62,6 @@ #ifndef QT_NO_QOBJECT #include "private/qobject_p.h" #include "private/qlocking_p.h" -#if QT_CONFIG(future) -#include <QtCore/qfuture.h> -#endif #endif #ifdef Q_OS_MACOS diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index 63d5cbaabd..53376340fc 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -44,10 +44,12 @@ #include <QtCore/qnativeinterface.h> #include <QtCore/qcoreapplication.h> +#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) #include <QtCore/qfuture.h> #include <QtCore/qvariant.h> #endif +#endif // #if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) #if defined(Q_OS_ANDROID) class _jobject; |