diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-03 13:17:30 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 15:31:42 +0200 |
commit | 9557395c96d4debc07c257a82c962ac97dada514 (patch) | |
tree | 9b16f80b2f5dbc30fa953695370eed8cb99acc74 | |
parent | e4207a79d14ee85fb4623e6903a64b0a596997f2 (diff) |
Fix ́́`macros' function test of `tst_headers'
Task-number: QTQAINFRA-324
Change-Id: I3202d9ee42de8174c5170f1b853884b19d5895e3
Reviewed-on: http://codereview.qt-project.org/5925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r-- | src/gui/image/qplatformpixmap_qpa.h | 6 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdrag_qpa.h | 6 | ||||
-rw-r--r-- | src/gui/opengl/qopengl.h | 6 | ||||
-rw-r--r-- | src/gui/painting/qbackingstore.h | 6 | ||||
-rw-r--r-- | src/gui/painting/qplatformbackingstore_qpa.h | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qplatformmenu_qpa.h | 6 |
6 files changed, 36 insertions, 0 deletions
diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap_qpa.h index d528f4138f..929d7df789 100644 --- a/src/gui/image/qplatformpixmap_qpa.h +++ b/src/gui/image/qplatformpixmap_qpa.h @@ -56,8 +56,12 @@ #include <QtGui/qpixmap.h> #include <QtCore/qatomic.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Gui) + class QImageReader; class Q_GUI_EXPORT QPlatformPixmap @@ -157,4 +161,6 @@ extern bool qt_xForm_helper(const QTransform&, int, int, int, uchar*, int, int, QT_END_NAMESPACE +QT_END_HEADER + #endif // QPIXMAPDATA_P_H diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag_qpa.h index 958bcf42c6..76d890b8c6 100644 --- a/src/gui/kernel/qplatformdrag_qpa.h +++ b/src/gui/kernel/qplatformdrag_qpa.h @@ -44,8 +44,12 @@ #include <QtCore/qglobal.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Gui) + class QMimeData; class QMouseEvent; @@ -64,4 +68,6 @@ public: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 6edec3c6c1..bc24d2fda6 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -46,6 +46,10 @@ QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + #if 1 #if defined(QT_OPENGL_ES_2) # if defined(Q_OS_MAC) @@ -71,6 +75,8 @@ typedef GLfloat GLdouble; #endif #endif +QT_END_NAMESPACE + QT_END_HEADER #endif // QOPENGL_H diff --git a/src/gui/painting/qbackingstore.h b/src/gui/painting/qbackingstore.h index 9f646f89ac..d5ec3b31d3 100644 --- a/src/gui/painting/qbackingstore.h +++ b/src/gui/painting/qbackingstore.h @@ -47,8 +47,12 @@ #include <QtGui/qwindow.h> #include <QtGui/qregion.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Gui) + class QRegion; class QRect; class QPoint; @@ -90,4 +94,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QBACKINGSTORE_H diff --git a/src/gui/painting/qplatformbackingstore_qpa.h b/src/gui/painting/qplatformbackingstore_qpa.h index 29730167b4..d5a2536ea6 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.h +++ b/src/gui/painting/qplatformbackingstore_qpa.h @@ -47,8 +47,12 @@ #include <QtGui/qwindow.h> #include <QtGui/qregion.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Gui) + class QRegion; class QRect; class QPoint; @@ -83,4 +87,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLATFORMBACKINGSTORE_QPA_H diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu_qpa.h index 2c88b48cf4..d2736ed354 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.h +++ b/src/widgets/kernel/qplatformmenu_qpa.h @@ -46,8 +46,12 @@ #include <QtCore/qpointer.h> #include <QtWidgets/qaction.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Gui) + class QMenuPrivate; class Q_WIDGETS_EXPORT QPlatformMenuAction { @@ -85,5 +89,7 @@ public: QT_END_NAMESPACE +QT_END_HEADER + #endif |