From 7c7184ad60688437dbc2d82e9ecd37d1b9e3638b Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 21 Oct 2021 15:56:25 +0200
Subject: [PATCH] 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>
---
 src/corelib/kernel/qcoreapplication.h          | 3 ---
 src/corelib/kernel/qcoreapplication_p.h        | 3 ---
 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;