aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2013-01-30 15:59:41 +0100
committerFriedemann Kleint <[email protected]>2013-01-30 18:20:07 +0100
commitc0fe6211277b83e8ea26a9cf6f193836f41ab462 (patch)
tree4eef179606b08f18dc0b3cd1e8570421e4bc6955 /src/libs
parent59b8c13ade5b685bfa7ed28346ddddf94c2f5cbd (diff)
Remove QT_BEGIN/END_HEADER, fixing compilation with Qt 5 (dev).
The macros were removed in 07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 . Change-Id: I4a43106ca85dc9ed97f75a4505888cb550305a8d Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Thomas Hartmann <[email protected]>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/qmleditorwidgets/easingpane/easinggraph.h4
-rw-r--r--src/libs/qmljs/parser/qmlerror.h4
-rw-r--r--src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h4
3 files changed, 0 insertions, 12 deletions
diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
index 297d36409b7..72531a47f45 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 57065bfd352..7719ceb3cc1 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 9a854187a99..c5ee05c296a 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