Fix merge errors introduced while rebasing.

Change-Id: I14973b94f404f9e4fe06b192ef177f01e0f5ef01
Reviewed-on: http://codereview.qt.nokia.com/3801
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

1 files changed, 0 insertions, 14 deletions

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 3bf04b35d4..5947a9a684 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -968,20 +968,6 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
     return -1;
 }
 
-bool QDeclarativeMetaType::isAnyModule(const QByteArray &module)
-{
-    QDeclarativeMetaTypeData *data = metaTypeData();
-
-    QDeclarativeMetaTypeData::ModuleInfoHash::Iterator it = data->modules.begin();
-    while (it != data->modules.end()) {
-        if (it.key().first == module)
-            return true;
-        ++it;
-    }
-
-    return false;
-}
-
 /*
     Returns true if a module \a uri of any version is installed.
 */