diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-30 15:59:41 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-30 18:20:07 +0100 |
| commit | c0fe6211277b83e8ea26a9cf6f193836f41ab462 (patch) | |
| tree | 4eef179606b08f18dc0b3cd1e8570421e4bc6955 /src/plugins | |
| parent | 59b8c13ade5b685bfa7ed28346ddddf94c2f5cbd (diff) | |
| download | qt-creator-c0fe6211277b83e8ea26a9cf6f193836f41ab462.tar.gz | |
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>
Diffstat (limited to 'src/plugins')
6 files changed, 0 insertions, 25 deletions
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 |