1 files changed, 10 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index cb8c2bd3b5..fbb21f4562 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -258,7 +258,7 @@ QObject *QQmlType::SingletonInstanceInfo::qobjectApi(QQmlEngine *e) const
     return qobjectApis.value(e);
 }
 
-void QQmlType::SingletonInstanceInfo::setScriptApi(QQmlEngine *e, QJSValue v)
+void QQmlType::SingletonInstanceInfo::setScriptApi(QQmlEngine *e, const QJSValue &v)
 {
     scriptApis.insert(e, v);
 }
@@ -1110,7 +1110,9 @@ void qmlClearTypeRegistrations() // Declared in qqml.h
     data->uriToModule.clear();
 
     QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types
+#ifndef QT_NO_LIBRARY
     qmlClearEnginePlugins();
+#endif
 }
 
 int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent)
@@ -1440,8 +1442,8 @@ bool QQmlMetaType::isAnyModule(const QString &uri)
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
 
-    for (QQmlMetaTypeData::TypeModules::ConstIterator iter = data->uriToModule.begin();
-         iter != data->uriToModule.end(); ++iter) {
+    for (QQmlMetaTypeData::TypeModules::ConstIterator iter = data->uriToModule.cbegin();
+         iter != data->uriToModule.cend(); ++iter) {
         if ((*iter)->module() == uri)
             return true;
     }
@@ -1718,7 +1720,7 @@ QQmlType *QQmlMetaType::qmlType(const QHashedStringRef &name, const QHashedStrin
     QQmlMetaTypeData *data = metaTypeData();
 
     QQmlMetaTypeData::Names::ConstIterator it = data->nameToType.constFind(name);
-    while (it != data->nameToType.end() && it.key() == name) {
+    while (it != data->nameToType.cend() && it.key() == name) {
         // XXX version_major<0 just a kludge for QQmlPropertyPrivate::initProperty
         if (version_major < 0 || module.isEmpty() || (*it)->availableInVersion(module, version_major,version_minor))
             return (*it);
@@ -1752,7 +1754,7 @@ QQmlType *QQmlMetaType::qmlType(const QMetaObject *metaObject, const QHashedStri
     QQmlMetaTypeData *data = metaTypeData();
 
     QQmlMetaTypeData::MetaObjects::const_iterator it = data->metaObjectToType.constFind(metaObject);
-    while (it != data->metaObjectToType.end() && it.key() == metaObject) {
+    while (it != data->metaObjectToType.cend() && it.key() == metaObject) {
         QQmlType *t = *it;
         if (version_major < 0 || module.isEmpty() || t->availableInVersion(module, version_major,version_minor))
             return t;
@@ -1823,8 +1825,9 @@ QList<QString> QQmlMetaType::qmlTypeNames()
     QQmlMetaTypeData *data = metaTypeData();
 
     QList<QString> names;
-    QQmlMetaTypeData::Names::ConstIterator it = data->nameToType.begin();
-    while (it != data->nameToType.end()) {
+    names.reserve(data->nameToType.count());
+    QQmlMetaTypeData::Names::ConstIterator it = data->nameToType.cbegin();
+    while (it != data->nameToType.cend()) {
         names += (*it)->qmlTypeName();
         ++it;
     }