AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove superfluous qfuture.h includes from qcoreapplication[_p].h

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2021-10-21 15:56:25 +02:00
parent c327cc60bf
commit 7c7184ad60
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qcoreapplication.h
View File

@ -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>

3
src/corelib/kernel/qcoreapplication_p.h
View File

@ -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

2
src/corelib/kernel/qcoreapplication_platform.h
View File

@ -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;