diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-15 14:04:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-06-25 08:01:04 +0000 |
| commit | 59c3670b63b6e97dac6115a0819e6c412d3f7888 (patch) | |
| tree | 291c928862d664645dd3611b7c7f9c92965acd79 /src/corelib/mimetypes | |
| parent | 72adb7f00ce92b33a7b85098c382152c913aaecb (diff) | |
Make sure all private headers in Qt Core include qglobal_p.h
The rule was:
- if the header included qglobal.h, turn that into qglobal_p.h
- otherwise, insert the #include after the "We mean it" warning
qglobal_p.h currently only includes qglobal.h.
Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/mimetypes')
| -rw-r--r-- | src/corelib/mimetypes/qmimeglobpattern_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/mimetypes/qmimemagicrule_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/mimetypes/qmimetype_p.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h index e4c74ff7fa..3e4fdb50f6 100644 --- a/src/corelib/mimetypes/qmimeglobpattern_p.h +++ b/src/corelib/mimetypes/qmimeglobpattern_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #ifndef QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index 26f93d96cc..0c6c1dbcd7 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #ifndef QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index c89ffbefa3..b0bfad2f65 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> #include "qmimetype.h" #ifndef QT_NO_MIMETYPE |