diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-22 09:53:38 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-03 07:55:57 +0000 |
| commit | e8fe65205cb519de83685376d8441ffda2c1974e (patch) | |
| tree | 4b02b37a869d4c8ef5f2921aca4b50e309cf5155 /src/gui/accessible | |
| parent | 5fa3e2a82e380e1ab8c8701405206b11e561600c (diff) | |
Add qtguiglobal.h and qtguiglobal_p.h
The new modular configuration system requires one global
header per module, that is included by all other files in
this module.
A similar scheme and naming convention is already being used
for many other modules (e.g. printsupport, qml, quick).
That header will later on #include the configuration file
for Qt Gui. For now it defines the Q_GUI_EXPORT macro for
this library.
In addition, add a private global header, qtguiglobal_p.h,
that can later on include the private config header for
Qt Gui for things we don't want to export to the world.
Change-Id: Id9ce2a4f3d2962c3592c35e3d080574789195f24
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/gui/accessible')
| -rw-r--r-- | src/gui/accessible/qaccessible.h | 2 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessiblebridge.h | 1 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessiblecache_p.h | 2 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessibleobject.h | 1 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessibleplugin.h | 1 | ||||
| -rw-r--r-- | src/gui/accessible/qplatformaccessibility.h | 4 |
6 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 7bc124f7d9..27756d764d 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <QtGui/qtguiglobal.h> #ifndef QT_NO_ACCESSIBILITY #ifndef QACCESSIBLE_H diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h index c161e01b0f..7429716e65 100644 --- a/src/gui/accessible/qaccessiblebridge.h +++ b/src/gui/accessible/qaccessiblebridge.h @@ -40,6 +40,7 @@ #ifndef QACCESSIBLEBRIDGE_H #define QACCESSIBLEBRIDGE_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h index b1fc0bbee5..5f62f43b6a 100644 --- a/src/gui/accessible/qaccessiblecache_p.h +++ b/src/gui/accessible/qaccessiblecache_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> #include <QtCore/qobject.h> #include <QtCore/qhash.h> diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h index 5918e942bd..dd69dcb081 100644 --- a/src/gui/accessible/qaccessibleobject.h +++ b/src/gui/accessible/qaccessibleobject.h @@ -40,6 +40,7 @@ #ifndef QACCESSIBLEOBJECT_H #define QACCESSIBLEOBJECT_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qaccessible.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h index b0c28e5bf8..09d4c542d3 100644 --- a/src/gui/accessible/qaccessibleplugin.h +++ b/src/gui/accessible/qaccessibleplugin.h @@ -40,6 +40,7 @@ #ifndef QACCESSIBLEPLUGIN_H #define QACCESSIBLEPLUGIN_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qaccessible.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/gui/accessible/qplatformaccessibility.h b/src/gui/accessible/qplatformaccessibility.h index 5dc4781bb2..5d668c2bd6 100644 --- a/src/gui/accessible/qplatformaccessibility.h +++ b/src/gui/accessible/qplatformaccessibility.h @@ -48,9 +48,11 @@ // source and binary incompatible with future versions of Qt. // -#include <QtCore/qobject.h> +#include <QtGui/qtguiglobal.h> + #ifndef QT_NO_ACCESSIBILITY +#include <QtCore/qobject.h> #include <QtGui/qaccessible.h> QT_BEGIN_NAMESPACE |