diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-19 03:52:07 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-19 03:52:07 (GMT) |
| commit | 08c45e83b05aa22b0d37a16aa01cbf5b3056bd15 (patch) | |
| tree | ad8c9eb1598f90061150a48118c7b45be2e3ef49 /src/declarative | |
| parent | d363016a703f565432d2fd3d84cea4e179c79995 (diff) | |
| parent | 02e81cd0262187e211a57958d8728981be2ab878 (diff) | |
| download | Qt-08c45e83b05aa22b0d37a16aa01cbf5b3056bd15.zip Qt-08c45e83b05aa22b0d37a16aa01cbf5b3056bd15.tar.gz Qt-08c45e83b05aa22b0d37a16aa01cbf5b3056bd15.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 86472de..e292e5c 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) -QML_DEFINE_TYPE(Qt,4,6,Object,QObject) +QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject) struct StaticQtMetaObject : public QObject { |