diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-16 03:50:28 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-16 03:50:28 (GMT) |
| commit | a17c34cdddf4bcc619fa660ea520400a1329b34e (patch) | |
| tree | e279b9621f4a5739bdb443dd6cc7e70745abe86c /src/declarative/qml/qmlworkerscript.cpp | |
| parent | 2ad3954c6a383553f000d5d223eff4acf34d3c77 (diff) | |
| parent | 6f3649260d157584361112a94733b92f10c01b84 (diff) | |
| download | Qt-a17c34cdddf4bcc619fa660ea520400a1329b34e.zip Qt-a17c34cdddf4bcc619fa660ea520400a1329b34e.tar.gz Qt-a17c34cdddf4bcc619fa660ea520400a1329b34e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlworkerscript.cpp')
| -rw-r--r-- | src/declarative/qml/qmlworkerscript.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index 5e39eaf..ec790ca 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -55,6 +55,7 @@ #include <QtDeclarative/qmlinfo.h> #include "qmlnetworkaccessmanagerfactory.h" + QT_BEGIN_NAMESPACE class WorkerDataEvent : public QEvent @@ -238,8 +239,13 @@ private: QAtomicInt m_ref; QmlWorkerListModel *m_model; }; + +QT_END_NAMESPACE + Q_DECLARE_METATYPE(QmlWorkerListModelAgent::VariantRef); +QT_BEGIN_NAMESPACE + QmlWorkerScriptEnginePrivate::QmlWorkerScriptEnginePrivate(QmlEngine *engine) : workerEngine(0), qmlengine(engine), m_nextId(0) { @@ -1030,8 +1036,10 @@ QVariant QmlWorkerListModel::data(int index, int role) const return m_values.at(index).value(role); } +QT_END_NAMESPACE + QML_DEFINE_TYPE(Qt,4,6,WorkerListModel,QmlWorkerListModel) #include "qmlworkerscript.moc" -QT_END_NAMESPACE + |