Commit c0fe6211 authored by Friedemann Kleint's avatar Friedemann Kleint

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

The macros were removed in
07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 .

Change-Id: I4a43106ca85dc9ed97f75a4505888cb550305a8d
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 59b8c13a
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment