diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
| commit | 34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd (patch) | |
| tree | a7e0c9a55afb413443c55733622e813e17eaea95 /src/declarative/qml | |
| parent | 685c0b930a1d1ecfdcc78aa688a333564cc9ca5b (diff) | |
| parent | fd7d730d04862095898773a781bb9a254d0aeb00 (diff) | |
| download | Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.zip Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.gz Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.bz2 | |
Merge branch 'master' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeworkerscript_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h index 01cc72a..912eac9 100644 --- a/src/declarative/qml/qdeclarativeworkerscript_p.h +++ b/src/declarative/qml/qdeclarativeworkerscript_p.h @@ -65,6 +65,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Declarative) + class QDeclarativeWorkerScript; class QDeclarativeWorkerScriptEnginePrivate; class QDeclarativeWorkerScriptEngine : public QThread |