diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-29 05:41:55 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-29 05:42:50 (GMT) |
| commit | a5e5b178615cea0dc795fd2008ef258030d2e8e6 (patch) | |
| tree | 83eadaa43a716dc98dfe773b3f43b24dd4733acb | |
| parent | 96551e8af08c6f5eb506468a1a79070f23525bca (diff) | |
| download | Qt-a5e5b178615cea0dc795fd2008ef258030d2e8e6.zip Qt-a5e5b178615cea0dc795fd2008ef258030d2e8e6.tar.gz Qt-a5e5b178615cea0dc795fd2008ef258030d2e8e6.tar.bz2 | |
Don't call qRegisterMetaType() in global scope
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index f312497..b81a32a 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -63,7 +63,6 @@ QT_BEGIN_NAMESPACE class QByteArray; -int statusId = qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status"); /*! \class QDeclarativeComponent diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index a22011a..19d4b57 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -347,6 +347,7 @@ void QDeclarativeEnginePrivate::init() qRegisterMetaType<QVariant>("QVariant"); qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString"); qRegisterMetaType<QScriptValue>("QScriptValue"); + qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status"); QDeclarativeData::init(); |