diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-16 01:32:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-16 01:32:35 (GMT) |
| commit | 6f3649260d157584361112a94733b92f10c01b84 (patch) | |
| tree | 13197132bd1f3854572728ff1699fa6780021365 /src/declarative/qml/qmlxmlhttprequest.cpp | |
| parent | b77e592cf9709c31f61c3e1d229b2a6c446ab8bc (diff) | |
| parent | e7041de4d51a3166948924fc8640c8c6bc8daa7b (diff) | |
| download | Qt-6f3649260d157584361112a94733b92f10c01b84.zip Qt-6f3649260d157584361112a94733b92f10c01b84.tar.gz Qt-6f3649260d157584361112a94733b92f10c01b84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlxmlhttprequest.cpp')
| -rw-r--r-- | src/declarative/qml/qmlxmlhttprequest.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp index 1883d1b..54e26df 100644 --- a/src/declarative/qml/qmlxmlhttprequest.cpp +++ b/src/declarative/qml/qmlxmlhttprequest.cpp @@ -91,7 +91,7 @@ #define D(arg) (arg)->release() #define A(arg) (arg)->addref() -namespace { +QT_BEGIN_NAMESPACE class DocumentImpl; class NodeImpl @@ -315,12 +315,14 @@ public: static QScriptValue load(QScriptEngine *engine, const QString &data); }; -}; // namespace +QT_END_NAMESPACE Q_DECLARE_METATYPE(Node); Q_DECLARE_METATYPE(NodeList); Q_DECLARE_METATYPE(NamedNodeMap); +QT_BEGIN_NAMESPACE + void NodeImpl::addref() { A(document); @@ -1624,4 +1626,6 @@ void qt_add_qmlxmlhttprequest(QScriptEngine *engine) engine->globalObject().setProperty(QLatin1String("DOMException"), domExceptionPrototype); } +QT_END_NAMESPACE + #include <qmlxmlhttprequest.moc> |