diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
| commit | 56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch) | |
| tree | 597051d1f3b73595f48bcad5a5acb24026c6ba66 /src/declarative/qml/qmlengine.cpp | |
| parent | e26db74521e063a1513731eb14581d93a3d77481 (diff) | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| download | Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c7e1e16..a846ea1 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -117,6 +117,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject) /*! \qmlclass QtObject QObject + \since 4.7 \brief The QtObject element is the most basic element in QML The QtObject element is a non-visual element which contains only @@ -359,6 +360,7 @@ QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine() /*! \class QmlEngine + \since 4.7 \brief The QmlEngine class provides an environment for instantiating QML components. \mainclass |