Fixed more declarative -qtnamespace compilation issues.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 21 Nov 2011 02:48:06 +0000 (12:48 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 21 Nov 2011 05:16:24 +0000 (06:16 +0100)
Change-Id: I56a00af1e360887af97eb98f2c6756fb90ba75d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

src/declarative/qml/v8/qv8sequencewrapper_p_p.h

index 04814e9..eea595e 100644 (file)
@@ -220,7 +220,9 @@ static QString convertUrlToString(QV8Engine *, const QUrl &v)
     F(QUrl, Url, QList<QUrl>, QUrl())
 
 #define QML_SEQUENCE_TYPE_RESOURCE(SequenceElementType, SequenceElementTypeName, SequenceType, DefaultValue, ConversionToV8fn, ConversionFromV8fn, ToStringfn) \
+    QT_END_NAMESPACE \
     Q_DECLARE_METATYPE(SequenceType) \
+    QT_BEGIN_NAMESPACE \
     class QV8##SequenceElementTypeName##SequenceResource : public QV8SequenceResource { \
         public:\
             QV8##SequenceElementTypeName##SequenceResource(QV8Engine *engine, QObject *obj, int propIdx) \
@@ -373,4 +375,6 @@ FOREACH_QML_SEQUENCE_TYPE(GENERATE_QML_SEQUENCE_TYPE_RESOURCE)
 #undef GENERATE_QML_SEQUENCE_TYPE_RESOURCE
 #undef QML_SEQUENCE_TYPE_RESOURCE
 
+QT_END_NAMESPACE
+
 #endif // QV8SEQUENCEWRAPPER_P_P_H