summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-07-31 20:50:18 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-01 00:14:41 +0200
commit3e3790b2c78d3aeeff138ff7aca4a94f3bfeb850 (patch)
tree32d90bd966dd948c71ad5e674c7a1681daa6116e /src
parent8f1fd5ecc85f9216eda92156104b456fd44eadf1 (diff)
Fix some syncqt warnings.
Change-Id: I6f432ee991f4bde217fa27d4004ef318f1d480e0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/concurrent/qtconcurrent_global.h6
-rw-r--r--src/corelib/global/qisenum.h6
-rw-r--r--src/corelib/mimetypes/qmimedatabase.h2
-rw-r--r--src/corelib/mimetypes/qmimetype.h2
-rw-r--r--src/testlib/qtest_widgets.h8
5 files changed, 23 insertions, 1 deletions
diff --git a/src/concurrent/qtconcurrent_global.h b/src/concurrent/qtconcurrent_global.h
index 7bcd6942c5..7701283f2b 100644
--- a/src/concurrent/qtconcurrent_global.h
+++ b/src/concurrent/qtconcurrent_global.h
@@ -44,6 +44,9 @@
#include <QtCore/qglobal.h>
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
#ifdef QT_NO_CONCURRENT
# define QT_NO_QFUTURE
#endif
@@ -58,4 +61,7 @@
# define Q_CONCURRENT_EXPORT
#endif
+QT_END_NAMESPACE
+QT_END_HEADER
+
#endif // include guard
diff --git a/src/corelib/global/qisenum.h b/src/corelib/global/qisenum.h
index 53b856e1c2..dc1c41c08e 100644
--- a/src/corelib/global/qisenum.h
+++ b/src/corelib/global/qisenum.h
@@ -61,4 +61,10 @@
# define Q_IS_ENUM(x) QtPrivate::is_enum<x>::value
#endif
+// shut up syncqt
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
+QT_END_HEADER
+
#endif // QISENUM_H
diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h
index 96ddee73c4..bdb5ec0a6b 100644
--- a/src/corelib/mimetypes/qmimedatabase.h
+++ b/src/corelib/mimetypes/qmimedatabase.h
@@ -45,6 +45,7 @@
#include <QtCore/qmimetype.h>
#include <QtCore/qstringlist.h>
+QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QByteArray;
@@ -98,5 +99,6 @@ private:
};
QT_END_NAMESPACE
+QT_END_HEADER
#endif // QMIMEDATABASE_H
diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h
index 04a24ffcce..b7c49c8529 100644
--- a/src/corelib/mimetypes/qmimetype.h
+++ b/src/corelib/mimetypes/qmimetype.h
@@ -45,6 +45,7 @@
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
+QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QMimeTypePrivate;
@@ -110,5 +111,6 @@ protected:
Q_DECLARE_SHARED(QMimeType)
QT_END_NAMESPACE
+QT_END_HEADER
#endif // QMIMETYPE_H
diff --git a/src/testlib/qtest_widgets.h b/src/testlib/qtest_widgets.h
index 5e3aa3210f..b665e84d3e 100644
--- a/src/testlib/qtest_widgets.h
+++ b/src/testlib/qtest_widgets.h
@@ -50,12 +50,18 @@
#pragma qt_class(QtTestWidgets)
#endif
-#include <qtest_gui.h>
+#include <QtTest/qtest_gui.h>
#if 0
// inform syncqt
#pragma qt_no_master_include
#endif
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
#endif