Remove QT_BEGIN/END_HEADER, fixing compilation with Qt 5 (dev).

The macros were removed in
07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 .

Change-Id: I4a43106ca85dc9ed97f75a4505888cb550305a8d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

12 files changed, 0 insertions, 49 deletions

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
index 16287353a5..0c6d0084df 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
@@ -33,8 +33,6 @@
 #include "../qmljsdebugger_global.h"
 #include <qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QScriptEngine;
@@ -55,6 +53,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDECLARATIVEDEBUGHELPER_P_H
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
index c404c9de9b..bd220ff059 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
@@ -33,8 +33,6 @@
 #include "../qmljsdebugger_global.h"
 #include <qobject.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -75,7 +73,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDECLARATIVEDEBUGSERVICE_H
 
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
index 60a2e932b6..cc1a81ab6b 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
@@ -37,8 +37,6 @@
 #include <qobject.h>
 #include <qsharedpointer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -193,6 +191,4 @@ QT_END_NAMESPACE
 //QML_DECLARE_TYPE(QDeclarativeStateOperation)
 //QML_DECLARE_TYPE(QDeclarativeState)
 
-QT_END_HEADER
-
 #endif // QDECLARATIVESTATE_H
diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
index 297d36409b..72531a47f4 100644
--- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h
+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
@@ -34,8 +34,6 @@
 #include <QEasingCurve>
 #include <QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -112,6 +110,4 @@ QT_END_NAMESPACE
 
 //QML_DECLARE_TYPE(EasingGraph)
 
-QT_END_HEADER
-
 #endif // EASINGGRAPH_H
diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h
index 57065bfd35..7719ceb3cc 100644
--- a/src/libs/qmljs/parser/qmlerror.h
+++ b/src/libs/qmljs/parser/qmlerror.h
@@ -35,8 +35,6 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -72,6 +70,4 @@ Q_DECLARE_TYPEINFO(QmlError, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QQMLERROR_H
diff --git a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
index 9a854187a9..c5ee05c296 100644
--- a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
@@ -37,8 +37,6 @@
 
 #ifndef QT_NO_DIRMODEL
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -141,8 +139,6 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QDeclarativeFolderListModel)
 //![qml decl]
 
-QT_END_HEADER
-
 #endif // QT_NO_DIRMODEL
 
 #endif // QDECLARATIVEFOLDERLISTMODEL_H
diff --git a/src/plugins/designer/qt_private/abstractsettings_p.h b/src/plugins/designer/qt_private/abstractsettings_p.h
index 1834944831..f2463a9adf 100644
--- a/src/plugins/designer/qt_private/abstractsettings_p.h
+++ b/src/plugins/designer/qt_private/abstractsettings_p.h
@@ -45,8 +45,6 @@
 
 #include <QVariant>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -70,6 +68,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTSETTINGS_P_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
index 12c79e4037..9b073818ed 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
@@ -33,9 +33,6 @@
 #include <qlayoutobject.h>
 #include <QHBoxLayout>
 
-
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -178,6 +175,4 @@ public:
     static void registerDeclarativeTypes();
 };
 
-QT_END_HEADER
-
 #endif // BASICLAYOUTS_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
index 205bae03bb..0614607c0b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
@@ -35,8 +35,6 @@
 #include <qdeclarative.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -55,6 +53,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QLayoutObject)
 
-QT_END_HEADER
-
 #endif // QLAYOUTOBJECT_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
index dbb153fa1d..527bc9c783 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
@@ -33,8 +33,6 @@
 #include <qdeclarative.h>
 #include <QGraphicsLayout>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -95,7 +93,5 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QProxyLayout)
 QML_DECLARE_TYPE(QProxyLayoutItem)
 
-QT_END_HEADER
-
 #endif // QPROXYLAYOUTITEM_H
 
diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
index 2eb3096aa0..770b6757cc 100644
--- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
+++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
@@ -35,8 +35,6 @@
 #include "qdeclarativecontext2d_p.h"
 #include "qdeclarativecanvastimer_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -107,6 +105,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif //QDECLARATIVECANVAS_P_H
diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h
index 09a5b2c453..915afa542d 100644
--- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h
+++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h
@@ -34,8 +34,6 @@
 #include <qtimer.h>
 #include <qlist.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -63,6 +61,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDECLARATIVECANVASTIMER_P_H