Add QT_BEGIN_HEADER/QT_END_HEADER macros

Fixing `macros' function test of `tst_headers'

Task-number: QTQAINFRA-324
Change-Id: I0cd3ea6ee631c3e19078eda2104c78803d77939d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>

diff --git a/src/declarative/designer/designersupport.h b/src/declarative/designer/designersupport.h
index 8b9df68..7654363 100644 (file)
--- a/src/declarative/designer/designersupport.h
+++ b/src/declarative/designer/designersupport.h
@@ -58,6 +58,8 @@
 #include <QtCore/QHash>
 #include <QtCore/QRectF>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -146,4 +148,6 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #endif // DESIGNERSUPPORT_H

diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h
index a83d176..50c31f0 100644 (file)
--- a/src/qmltest/quicktest.h
+++ b/src/qmltest/quicktest.h
@@ -48,6 +48,8 @@
 #include <QtGui/qopengl.h>
 #endif
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
 typedef QWidget *(*quick_test_viewport_create)();
@@ -94,4 +96,6 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name,
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #endif

diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h
index 6d5c521..389674c 100644 (file)
--- a/src/qmltest/quicktestglobal.h
+++ b/src/qmltest/quicktestglobal.h
@@ -44,6 +44,8 @@
 
 #include <QtCore/qglobal.h>
 
+QT_BEGIN_HEADER
+
 QT_LICENSED_MODULE(QtQuickTest)
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #  if defined(QT_NODLL)
@@ -70,4 +72,6 @@ QT_LICENSED_MODULE(QtQuickTest)
 #   endif
 #endif
 
+QT_END_HEADER
+
 #endif