1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMetaObject: clean up includes

Browse Source 
Remove duplicate ones and regroup them.

Add a comment explaining why qthread(_p).h isn't guarded by an
`#if QT_CONFIG(thread)`; thanks to Fabian Kosmale for the explanation.

Change-Id: I9b13fd62ab92fa6d2ffc4d004d77e95e95f5fb08
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 28db390ce686ec8af70334e80ceae5ee2ebf87df)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2023-10-30 00:10:23 +02:00 committed by Qt Cherry-pick Bot
parent bd179a8d2f
commit 6b4805333f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/kernel/qmetaobject.cpp
View File

@ -3,26 +3,23 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qmetaobject.h"
#include "qmetatype.h"
#include "qobject.h"
#include "qmetaobject_p.h"
#include "qmetatype.h"
#include "qmetatype_p.h"
#include "qobject.h"
#include "qobject_p.h"
#include <qcoreapplication.h>
#include <qcoreevent.h>
#include <qdatastream.h>
#include <qstringlist.h>
#include <qthread.h>
#include <qvariant.h>
#include <qdebug.h>
// qthread(_p).h uses QT_CONFIG(thread) internally and has a dummy
// interface for the non-thread support case
#include <qthread.h>
#include "private/qthread_p.h"
#if QT_CONFIG(thread)
#include <qsemaphore.h>
#endif
#include "private/qobject_p.h"
#include "private/qmetaobject_p.h"
#include "private/qthread_p.h"
// for normalizeTypeInternal
#include "private/qmetaobject_moc_p.h"