Support compile-in-namespace for the declarative module.

14 files changed, 29 insertions, 23 deletions

diff --git a/src/declarative/extra/qfxanimatedimageitem.h b/src/declarative/extra/qfxanimatedimageitem.h
index e59a8c7..86ded86 100644
--- a/src/declarative/extra/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qfxanimatedimageitem.h
@@ -90,10 +90,11 @@ private:
     Q_DISABLE_COPY(QFxAnimatedImageItem)
     Q_DECLARE_PRIVATE(QFxAnimatedImageItem)
 };
-QML_DECLARE_TYPE(QFxAnimatedImageItem)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxAnimatedImageItem)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qfxblendedimage.h b/src/declarative/extra/qfxblendedimage.h
index f16d543..44de94c 100644
--- a/src/declarative/extra/qfxblendedimage.h
+++ b/src/declarative/extra/qfxblendedimage.h
@@ -101,10 +101,11 @@ private:
     QPixmap primPix;
     QPixmap secPix;
 };
-QML_DECLARE_TYPE(QFxBlendedImage)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxBlendedImage)
+
 QT_END_HEADER
 
 #endif // QFXBLENDEDIMAGE_H
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index e3b79f5..254e423 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -42,6 +42,8 @@
 #include "qfxvisualitemmodel.h"
 #include "qfxflowview.h"
 
+#include <QGraphicsSceneMouseEvent>
+
 QT_BEGIN_NAMESPACE
 
 class QFxFlowViewAttached : public QObject
@@ -288,8 +290,6 @@ void QFxFlowView::moveItem(QFxItem *item, const QPointF &p)
     m_timeline.move(*yv, p.y(), 100);
 }
 
-#include <QGraphicsSceneMouseEvent>
-
 void QFxFlowView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     for (int ii = 0; ii < m_items.count(); ++ii) {
diff --git a/src/declarative/extra/qfxflowview.h b/src/declarative/extra/qfxflowview.h
index 0693d6e..2bec6a1 100644
--- a/src/declarative/extra/qfxflowview.h
+++ b/src/declarative/extra/qfxflowview.h
@@ -98,10 +98,11 @@ private:
     QList<QFxFlowViewValue *> m_values;
     int m_dragIdx;
 };
-QML_DECLARE_TYPE(QFxFlowView);
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxFlowView);
+
 QT_END_HEADER
 
 #endif // QFXFLOWVIEW_H
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h
index 7c522f8..7fced2c 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qfxintegermodel.h
@@ -77,10 +77,10 @@ private:
     QFxIntegerModelPrivate *d;
 };
 
-QML_DECLARE_TYPE(QFxIntegerModel)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxIntegerModel)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qmlbehaviour.h b/src/declarative/extra/qmlbehaviour.h
index 967d3aa..1b5f524 100644
--- a/src/declarative/extra/qmlbehaviour.h
+++ b/src/declarative/extra/qmlbehaviour.h
@@ -87,10 +87,11 @@ protected:
 private Q_SLOTS:
     void propertyValueChanged();
 };
-QML_DECLARE_TYPE(QmlBehaviour)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlBehaviour)
+
 QT_END_HEADER
 
 #endif // QMLBEHAVIOUR_H
diff --git a/src/declarative/extra/qmldatetimeformatter.h b/src/declarative/extra/qmldatetimeformatter.h
index c4f1362..71b366c 100644
--- a/src/declarative/extra/qmldatetimeformatter.h
+++ b/src/declarative/extra/qmldatetimeformatter.h
@@ -106,10 +106,11 @@ private:
     Q_DISABLE_COPY(QmlDateTimeFormatter)
     Q_DECLARE_PRIVATE(QmlDateTimeFormatter)
 };
-QML_DECLARE_TYPE(QmlDateTimeFormatter)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlDateTimeFormatter)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h
index 24af8c0..6924fa5 100644
--- a/src/declarative/extra/qmlnumberformatter.h
+++ b/src/declarative/extra/qmlnumberformatter.h
@@ -83,10 +83,10 @@ private:
     Q_DECLARE_PRIVATE(QmlNumberFormatter)
 };
 
-QML_DECLARE_TYPE(QmlNumberFormatter)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlNumberFormatter)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h
index 0fcb183..88a727a 100644
--- a/src/declarative/extra/qmlsqlconnection.h
+++ b/src/declarative/extra/qmlsqlconnection.h
@@ -108,10 +108,10 @@ private:
     Q_DECLARE_PRIVATE(QmlSqlConnection)
 };
 
-QML_DECLARE_TYPE(QmlSqlConnection)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlSqlConnection)
+
 QT_END_HEADER
 
 #endif // QMLXMLLISTMODEL_H
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 72e6560f..8be758f 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -82,8 +82,6 @@ private:
     Q_DECLARE_PRIVATE(QmlSqlBind)
 };
 
-QML_DECLARE_TYPE(QmlSqlBind)
-
 class QSqlQuery;
 class QmlSqlQueryPrivate;
 class Q_DECLARATIVE_EXPORT QmlSqlQuery : public QListModelInterface, public QmlParserStatus
@@ -135,10 +133,11 @@ private:
     Q_DECLARE_PRIVATE(QmlSqlQuery)
 };
 
-QML_DECLARE_TYPE(QmlSqlQuery)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlSqlBind)
+QML_DECLARE_TYPE(QmlSqlQuery)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qmltimer.h b/src/declarative/extra/qmltimer.h
index 2a73e65..0df4cb9 100644
--- a/src/declarative/extra/qmltimer.h
+++ b/src/declarative/extra/qmltimer.h
@@ -93,10 +93,11 @@ private Q_SLOTS:
     void ticked();
     void stateChanged(QAbstractAnimation::State,QAbstractAnimation::State);
 };
-QML_DECLARE_TYPE(QmlTimer)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlTimer)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h
index 0d41456..804f13f 100644
--- a/src/declarative/extra/qmlxmllistmodel.h
+++ b/src/declarative/extra/qmlxmllistmodel.h
@@ -84,7 +84,6 @@ private:
     QString m_name;
     QString m_query;
 };
-QML_DECLARE_TYPE(XmlListModelRole)
 
 class QmlXmlListModelPrivate;
 class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public QmlParserStatus
@@ -144,10 +143,11 @@ private:
     Q_DISABLE_COPY(QmlXmlListModel)
 };
 
-QML_DECLARE_TYPE(QmlXmlListModel)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(XmlListModelRole)
+QML_DECLARE_TYPE(QmlXmlListModel)
+
 QT_END_HEADER
 
 #endif // QMLXMLLISTMODEL_H
diff --git a/src/declarative/extra/qnumberformat.cpp b/src/declarative/extra/qnumberformat.cpp
index d317c27..cde2fb0 100644
--- a/src/declarative/extra/qnumberformat.cpp
+++ b/src/declarative/extra/qnumberformat.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QNumberFormat,NumberFormat)
+QML_DEFINE_NOCREATE_TYPE(QNumberFormat)
 
 QNumberFormat::QNumberFormat(QObject *parent) : QObject(parent), _number(0), _type(Decimal),
                                  _groupingSize(0)
diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h
index 92f89da..830cf79 100644
--- a/src/declarative/extra/qnumberformat.h
+++ b/src/declarative/extra/qnumberformat.h
@@ -163,10 +163,11 @@ private:
         QString _text;
 
 };
-QML_DECLARE_TYPE(QNumberFormat)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QNumberFormat)
+
 QT_END_HEADER
 
 #endif