From 35d0e655ad9eedf136d5b5da79e516f0e3cad56a Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 23 Jul 2010 12:33:52 +1000 Subject: Compile --- src/declarative/qml/qdeclarativemetatype.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 18b84cc..a5c878f 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -40,9 +40,6 @@ ****************************************************************************/ #include -static int registerType(const QDeclarativePrivate::RegisterType &); -static int registerInterface(const QDeclarativePrivate::RegisterInterface &); - #include "private/qdeclarativemetatype_p.h" #include "private/qdeclarativeproxymetaobject_p.h" @@ -489,7 +486,7 @@ int QDeclarativeType::index() const return d->m_index; } -static int registerAutoParentFunction(QDeclarativePrivate::RegisterAutoParent &autoparent) +int registerAutoParentFunction(QDeclarativePrivate::RegisterAutoParent &autoparent) { QWriteLocker lock(metaTypeDataLock()); QDeclarativeMetaTypeData *data = metaTypeData(); @@ -499,7 +496,7 @@ static int registerAutoParentFunction(QDeclarativePrivate::RegisterAutoParent &a return data->parentFunctions.count() - 1; } -static int registerInterface(const QDeclarativePrivate::RegisterInterface &interface) +int registerInterface(const QDeclarativePrivate::RegisterInterface &interface) { if (interface.version > 0) qFatal("qmlRegisterType(): Cannot mix incompatible QML versions."); @@ -528,7 +525,7 @@ static int registerInterface(const QDeclarativePrivate::RegisterInterface &inter return index; } -static int registerType(const QDeclarativePrivate::RegisterType &type) +int registerType(const QDeclarativePrivate::RegisterType &type) { if (type.elementName) { for (int ii = 0; type.elementName[ii]; ++ii) { -- cgit v0.12