diff options
-rw-r--r-- | src/declarative/qml/qml.h | 4 | ||||
-rw-r--r-- | src/declarative/qml/qmlsqldatabase_p.h | 3 | ||||
-rw-r--r-- | src/declarative/qml/qmlxmlhttprequest_p.h | 3 | ||||
-rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index c009093..f2b6b08 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -77,6 +77,7 @@ enum { /* TYPEINFO flags */ }; #define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \ +QT_BEGIN_NAMESPACE \ template <> \ class QmlTypeInfo<TYPE > \ { \ @@ -84,7 +85,8 @@ public: \ enum { \ hasAttachedProperties = (((FLAGS) & QML_HAS_ATTACHED_PROPERTIES) == QML_HAS_ATTACHED_PROPERTIES) \ }; \ -}; +}; \ +QT_END_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlsqldatabase_p.h b/src/declarative/qml/qmlsqldatabase_p.h index 9965a2b..f7d2078 100644 --- a/src/declarative/qml/qmlsqldatabase_p.h +++ b/src/declarative/qml/qmlsqldatabase_p.h @@ -53,6 +53,9 @@ // // We mean it. // + +#include <QtCore/qglobal.h> + QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/declarative/qml/qmlxmlhttprequest_p.h b/src/declarative/qml/qmlxmlhttprequest_p.h index 3a81278..11ed027 100644 --- a/src/declarative/qml/qmlxmlhttprequest_p.h +++ b/src/declarative/qml/qmlxmlhttprequest_p.h @@ -53,6 +53,9 @@ // // We mean it. // + +#include <QtCore/qglobal.h> + QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 3cfbee2..cb1bef4 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -135,10 +135,10 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(Screen) -QT_BEGIN_NAMESPACE - QML_DEFINE_TYPE(QmlViewer, 1, 0, Screen, Screen) +QT_BEGIN_NAMESPACE + class SizedMenuBar : public QMenuBar { Q_OBJECT |