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

Reduce qaccessible includes

Browse Source 
Forward declare some types in qaccessiblewidgetfactory_p.h instead of
including qaccessible.h. In turn, qapplication.cpp which relied on
transitive includes now needs to include qaccessible_base.h.

Change-Id: I8ac00d45a7ffccd84769fb210f29364a45bcd59e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
Fabian Kosmale 2022-02-04 23:33:21 +01:00
parent 1734c4ee98
commit 4fe8ed6288
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/accessible/qaccessiblewidgetfactory_p.h
View File

@ -38,7 +38,6 @@
****************************************************************************/ ****************************************************************************/
#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <QtGui/qaccessible.h>
#ifndef QACCESSIBLEWIDGETFACTORY_H #ifndef QACCESSIBLEWIDGETFACTORY_H
#define QACCESSIBLEWIDGETFACTORY_H #define QACCESSIBLEWIDGETFACTORY_H
@ -56,6 +55,10 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QObject;
class QAccessibleInterface;
class QString;
QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *object); QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *object);
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/widgets/kernel/qapplication.cpp
View File

@ -84,6 +84,9 @@
#if QT_CONFIG(whatsthis) #if QT_CONFIG(whatsthis)
#include <QtWidgets/QWhatsThis> #include <QtWidgets/QWhatsThis>
#endif #endif
#ifndef QT_NO_ACCESSIBILITY
#include <QtGui/qaccessible_base.h>
#endif
#include "private/qkeymapper_p.h" #include "private/qkeymapper_p.h"
#include "private/qaccessiblewidgetfactory_p.h" #include "private/qaccessiblewidgetfactory_p.h"