diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-14 05:33:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-14 05:33:48 (GMT) |
| commit | 2f6eb60bf4012f9a185d7cd5d4c50762c3abc7f7 (patch) | |
| tree | af33de7c70ece6ce83cb6ac7ef550df1ac1f1585 | |
| parent | bf7c254b0c98bd865ab241c631c22939e7624602 (diff) | |
| download | Qt-2f6eb60bf4012f9a185d7cd5d4c50762c3abc7f7.zip Qt-2f6eb60bf4012f9a185d7cd5d4c50762c3abc7f7.tar.gz Qt-2f6eb60bf4012f9a185d7cd5d4c50762c3abc7f7.tar.bz2 | |
Only add "include" property in non-workerscript threads
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 5cb59da..8d3ca59 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -205,7 +205,8 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr // XXX used to add Qt.Sound class. //types - qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2)); + if (mainthread) + qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2)); qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1)); qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4)); qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4)); |