feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
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>
This commit is contained in:
Friedemann Kleint
2013-01-30 15:59:41 +01:00
parent 59b8c13ade
commit c0fe621127
12 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
View File

@@ -33,8 +33,6 @@
#include "../qmljsdebugger_global.h" #include "../qmljsdebugger_global.h"
#include <qglobal.h> #include <qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QScriptEngine; class QScriptEngine;
@@ -55,6 +53,4 @@ public:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif // QDECLARATIVEDEBUGHELPER_P_H #endif // QDECLARATIVEDEBUGHELPER_P_H

4
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
View File

@@ -33,8 +33,6 @@
#include "../qmljsdebugger_global.h" #include "../qmljsdebugger_global.h"
#include <qobject.h> #include <qobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -75,7 +73,5 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif // QDECLARATIVEDEBUGSERVICE_H #endif // QDECLARATIVEDEBUGSERVICE_H

4
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
View File

@@ -37,8 +37,6 @@
#include <qobject.h> #include <qobject.h>
#include <qsharedpointer.h> #include <qsharedpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -193,6 +191,4 @@ QT_END_NAMESPACE
//QML_DECLARE_TYPE(QDeclarativeStateOperation) //QML_DECLARE_TYPE(QDeclarativeStateOperation)
//QML_DECLARE_TYPE(QDeclarativeState) //QML_DECLARE_TYPE(QDeclarativeState)
QT_END_HEADER
#endif // QDECLARATIVESTATE_H #endif // QDECLARATIVESTATE_H

4
src/libs/qmleditorwidgets/easingpane/easinggraph.h
View File

@@ -34,8 +34,6 @@
#include <QEasingCurve> #include <QEasingCurve>
#include <QHash> #include <QHash>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -112,6 +110,4 @@ QT_END_NAMESPACE
//QML_DECLARE_TYPE(EasingGraph) //QML_DECLARE_TYPE(EasingGraph)
QT_END_HEADER
#endif // EASINGGRAPH_H #endif // EASINGGRAPH_H

4
src/libs/qmljs/parser/qmlerror.h
View File

@@ -35,8 +35,6 @@
#include <QtCore/qurl.h> #include <QtCore/qurl.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -72,6 +70,4 @@ Q_DECLARE_TYPEINFO(QmlError, Q_MOVABLE_TYPE);
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif // QQMLERROR_H #endif // QQMLERROR_H

4
src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
View File

@@ -37,8 +37,6 @@
#ifndef QT_NO_DIRMODEL #ifndef QT_NO_DIRMODEL
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -141,8 +139,6 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QDeclarativeFolderListModel) QML_DECLARE_TYPE(QDeclarativeFolderListModel)
//![qml decl] //![qml decl]
QT_END_HEADER
#endif // QT_NO_DIRMODEL #endif // QT_NO_DIRMODEL
#endif // QDECLARATIVEFOLDERLISTMODEL_H #endif // QDECLARATIVEFOLDERLISTMODEL_H

4
src/plugins/designer/qt_private/abstractsettings_p.h
View File

@@ -45,8 +45,6 @@
#include <QVariant> #include <QVariant>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QString; class QString;
@@ -70,6 +68,4 @@ public:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif // ABSTRACTSETTINGS_P_H #endif // ABSTRACTSETTINGS_P_H

5
src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
View File

@@ -33,9 +33,6 @@
#include <qlayoutobject.h> #include <qlayoutobject.h>
#include <QHBoxLayout> #include <QHBoxLayout>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -178,6 +175,4 @@ public:
static void registerDeclarativeTypes(); static void registerDeclarativeTypes();
}; };
QT_END_HEADER
#endif // BASICLAYOUTS_H #endif // BASICLAYOUTS_H

4
src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
View File

@@ -35,8 +35,6 @@
#include <qdeclarative.h> #include <qdeclarative.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -55,6 +53,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QLayoutObject) QML_DECLARE_TYPE(QLayoutObject)
QT_END_HEADER
#endif // QLAYOUTOBJECT_H #endif // QLAYOUTOBJECT_H

4
src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
View File

@@ -33,8 +33,6 @@
#include <qdeclarative.h> #include <qdeclarative.h>
#include <QGraphicsLayout> #include <QGraphicsLayout>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -95,7 +93,5 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QProxyLayout) QML_DECLARE_TYPE(QProxyLayout)
QML_DECLARE_TYPE(QProxyLayoutItem) QML_DECLARE_TYPE(QProxyLayoutItem)
QT_END_HEADER
#endif // QPROXYLAYOUTITEM_H #endif // QPROXYLAYOUTITEM_H

4
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
View File

@@ -35,8 +35,6 @@
#include "qdeclarativecontext2d_p.h" #include "qdeclarativecontext2d_p.h"
#include "qdeclarativecanvastimer_p.h" #include "qdeclarativecanvastimer_p.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -107,6 +105,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif //QDECLARATIVECANVAS_P_H #endif //QDECLARATIVECANVAS_P_H

4
src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h
View File

@@ -34,8 +34,6 @@
#include <qtimer.h> #include <qtimer.h>
#include <qlist.h> #include <qlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Declarative) QT_MODULE(Declarative)
@@ -63,6 +61,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER
#endif // QDECLARATIVECANVASTIMER_P_H #endif // QDECLARATIVECANVASTIMER_P_H