diff options
| author | hjk <qtc-committer@nokia.com> | 2010-02-17 15:09:42 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-02-18 14:09:20 (GMT) |
| commit | fa1b0faa1ede809dae3c46ecfce0ef760b887b7c (patch) | |
| tree | 197651c364f763b9a43e22d5f5bafc6c5d69eb3d /src | |
| parent | 21df89dae6c0646ec5066efaea0ec2986c7c4588 (diff) | |
| download | Qt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.zip Qt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.tar.gz Qt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.tar.bz2 | |
Compile fix with namepaces
Task-number: QTBUG-8205
Diffstat (limited to 'src')
| -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 |
3 files changed, 9 insertions, 1 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; |