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/util | |
| 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/util')
| -rw-r--r-- | src/gui/util/qabstractlayoutstyleinfo_p.h | 1 | ||||
| -rw-r--r-- | src/gui/util/qdesktopservices.h | 1 | ||||
| -rw-r--r-- | src/gui/util/qgridlayoutengine_p.h | 1 | ||||
| -rw-r--r-- | src/gui/util/qhexstring_p.h | 2 | ||||
| -rw-r--r-- | src/gui/util/qlayoutpolicy_p.h | 1 | ||||
| -rw-r--r-- | src/gui/util/qvalidator.h | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/util/qabstractlayoutstyleinfo_p.h b/src/gui/util/qabstractlayoutstyleinfo_p.h index b8f3825ada..bf1e1fc852 100644 --- a/src/gui/util/qabstractlayoutstyleinfo_p.h +++ b/src/gui/util/qabstractlayoutstyleinfo_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include <QtCore/qnamespace.h> #include "qlayoutpolicy_p.h" diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h index 3d44ab4a1e..21705e2757 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h @@ -40,6 +40,7 @@ #ifndef QDESKTOPSERVICES_H #define QDESKTOPSERVICES_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qstring.h> #include <QtCore/qstandardpaths.h> diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index d79d4cc9c9..5f0cc5da73 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "qalgorithms.h" #include "qbitarray.h" #include "qlist.h" diff --git a/src/gui/util/qhexstring_p.h b/src/gui/util/qhexstring_p.h index ac11c8ad14..511eec0f1b 100644 --- a/src/gui/util/qhexstring_p.h +++ b/src/gui/util/qhexstring_p.h @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> #include <QtGui/qpolygon.h> diff --git a/src/gui/util/qlayoutpolicy_p.h b/src/gui/util/qlayoutpolicy_p.h index 979b808563..a729a57e8b 100644 --- a/src/gui/util/qlayoutpolicy_p.h +++ b/src/gui/util/qlayoutpolicy_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include <QtCore/qobject.h> #include <QtCore/qnamespace.h> diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index 85787a66c6..eba4b54672 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -41,6 +41,7 @@ #ifndef QVALIDATOR_H #define QVALIDATOR_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> #include <QtCore/qregexp.h> |