diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-21 15:56:25 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-22 09:48:41 +0200 |
| commit | 7c7184ad60688437dbc2d82e9ecd37d1b9e3638b (patch) | |
| tree | fd137940217c996974ecea4e071ca3ab2e589f17 /src/corelib/kernel | |
| parent | c327cc60bf163b3a66a1726b67fad514485dfe20 (diff) | |
Remove superfluous qfuture.h includes from qcoreapplication[_p].h
This include is only needed on Android, and removing it improves build
times slightly.
Remove the include from qcoreapplication.h and guard the includes in
qcoreapplication_platform.h properly for Android.
Remove the include from qcoreapplication_p.h as well. This was a
left-over from the app permissions API that was removed.
Pick-to: 6.2
Task-number: QTBUG-97601
Change-Id: I131baebe3e08e93ad5420d40908c2dceab89554c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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; |