Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	configure.exe
	src/imports/multimedia/qdeclarativeaudio.cpp
	src/imports/multimedia/qdeclarativeaudio_p.h
	src/multimedia/mediaservices/mediaservices.pro
	src/plugins/mediaservices/mediaservices.pro
	src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
	src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
	src/s60installs/s60installs.pro
	src/src.pro

1 files changed, 87 insertions, 859 deletions

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 0ee6dfe..79f8a17 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -67,6 +67,7 @@
 #include "qdeclarativeextensioninterface.h"
 #include "private/qdeclarativelist_p.h"
 #include "private/qdeclarativetypenamecache_p.h"
+#include "private/qdeclarativeinclude_p.h"
 
 #include <QtCore/qmetaobject.h>
 #include <QScriptClass>
@@ -82,6 +83,7 @@
 #include <QStack>
 #include <QMap>
 #include <QPluginLoader>
+#include <QtGui/qfontdatabase.h>
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qthreadstorage.h>
 #include <QtCore/qthread.h>
@@ -111,9 +113,6 @@ Q_DECLARE_METATYPE(QDeclarativeProperty)
 
 QT_BEGIN_NAMESPACE
 
-DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
-DEFINE_BOOL_CONFIG_OPTION(qmlCheckTypes, QML_CHECK_TYPES)
-
 /*!
   \qmlclass QtObject QObject
   \since 4.7
@@ -158,7 +157,7 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
   objectClass(0), valueTypeClass(0), globalClass(0), cleanup(0), erroredBindings(0),
   inProgressCreations(0), scriptEngine(this), workerScriptEngine(0), componentAttached(0),
   inBeginCreate(false), networkAccessManager(0), networkAccessManagerFactory(0),
-  typeManager(e), uniqueId(1)
+  typeManager(e), importDatabase(e), uniqueId(1)
 {
     if (!qt_QmlQtModule_registered) {
         qt_QmlQtModule_registered = true;
@@ -168,27 +167,6 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
         QDeclarativeValueTypeFactory::registerValueTypes();
     }
     globalClass = new QDeclarativeGlobalScriptClass(&scriptEngine);
-
-    // env import paths
-    QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
-    if (!envImportPath.isEmpty()) {
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-        QLatin1Char pathSep(';');
-#else
-        QLatin1Char pathSep(':');
-#endif
-        foreach (const QString &path, QString::fromLatin1(envImportPath).split(pathSep, QString::SkipEmptyParts)) {
-            QString canonicalPath = QDir(path).canonicalPath();
-            if (!canonicalPath.isEmpty() && !fileImportPath.contains(canonicalPath))
-                fileImportPath.append(canonicalPath);
-        }
-    }
-    QString builtinPath = QLibraryInfo::location(QLibraryInfo::ImportsPath);
-    if (!builtinPath.isEmpty())
-        fileImportPath += builtinPath;
-
-    filePluginPath += QLatin1String(".");
-
 }
 
 QUrl QDeclarativeScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url)
@@ -227,6 +205,11 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr
     // XXX used to add Qt.Sound class.
 
     //types
+    if (mainthread)
+        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
+    else
+        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::worker_include, 2));
+
     qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1));
     qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
     qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
@@ -249,6 +232,7 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr
 
     //misc methods
     qtObject.setProperty(QLatin1String("openUrlExternally"),newFunction(QDeclarativeEnginePrivate::desktopOpenUrl, 1));
+    qtObject.setProperty(QLatin1String("fontFamilies"),newFunction(QDeclarativeEnginePrivate::fontFamilies, 0));
     qtObject.setProperty(QLatin1String("md5"),newFunction(QDeclarativeEnginePrivate::md5, 1));
     qtObject.setProperty(QLatin1String("btoa"),newFunction(QDeclarativeEnginePrivate::btoa, 1));
     qtObject.setProperty(QLatin1String("atob"),newFunction(QDeclarativeEnginePrivate::atob, 1));
@@ -345,17 +329,17 @@ void QDeclarativeEnginePrivate::clear(SimpleList<QDeclarativeParserStatus> &pss)
 }
 
 Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer);
-typedef QMap<QString, QString> StringStringMap;
-Q_GLOBAL_STATIC(StringStringMap, qmlEnginePluginsWithRegisteredTypes); // stores the uri
-
 
 void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *o)
 {
     QObjectPrivate *p = QObjectPrivate::get(o);
-    Q_ASSERT(p->declarativeData);
-    QDeclarativeData *d = static_cast<QDeclarativeData*>(p->declarativeData);
-    if (d->ownContext)
-        d->context->destroy();
+    if (p->declarativeData) {
+        QDeclarativeData *d = static_cast<QDeclarativeData*>(p->declarativeData);
+        if (d->ownContext && d->context) {
+            d->context->destroy();
+            d->context = 0;
+        }
+    }
 }
 
 void QDeclarativeData::destroyed(QAbstractDeclarativeData *d, QObject *o)
@@ -374,6 +358,7 @@ void QDeclarativeEnginePrivate::init()
     qRegisterMetaType<QVariant>("QVariant");
     qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString");
     qRegisterMetaType<QScriptValue>("QScriptValue");
+    qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status");
 
     QDeclarativeData::init();
 
@@ -456,7 +441,11 @@ QDeclarativeEngine::~QDeclarativeEngine()
 }
 
 /*! \fn void QDeclarativeEngine::quit()
-  This signal is emitted when the QDeclarativeEngine quits.
+    This signal is emitted when the QDeclarativeEngine quits.
+ */
+
+/*! \fn void QDeclarativeEngine::warnings(const QList<QDeclarativeError> &warnings)
+    This signal is emitted when \a warnings messages are generated by QML.
  */
 
 /*!
@@ -573,9 +562,9 @@ QNetworkAccessManager *QDeclarativeEngine::networkAccessManager() const
 
   This example creates a provider with id \e colors:
 
-  \snippet examples/declarative/imageprovider/imageprovider.cpp 0
+  \snippet examples/declarative/cppextensions/imageprovider/imageprovider.cpp 0
 
-  \snippet examples/declarative/imageprovider/imageprovider-example.qml 0
+  \snippet examples/declarative/cppextensions/imageprovider/imageprovider-example.qml 0
 
   \sa removeImageProvider()
 */
@@ -892,14 +881,10 @@ void QDeclarativeData::destroyed(QObject *object)
     if (ownContext && context)
         context->destroy();
 
-    QDeclarativeGuard<QObject> *guard = guards;
-    while (guard) {
-        QDeclarativeGuard<QObject> *g = guard;
-        guard = guard->next;
-        g->o = 0;
-        g->prev = 0;
-        g->next = 0;
-        g->objectDestroyed(object);
+    while (guards) {
+        QDeclarativeGuard<QObject> *guard = guards;
+        *guard = (QObject *)0;
+        guard->objectDestroyed(object);
     }
 
     if (scriptValue)
@@ -986,7 +971,7 @@ QScriptValue QDeclarativeEnginePrivate::createComponent(QScriptContext *ctxt, QS
     Q_ASSERT(context);
 
     if(ctxt->argumentCount() != 1) {
-        return ctxt->throwError("Qt.createComponent(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createComponent(): Invalid arguments"));
     }else{
         QString arg = ctxt->argument(0).toString();
         if (arg.isEmpty())
@@ -1006,7 +991,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     QDeclarativeEngine* activeEngine = activeEnginePriv->q_func();
 
     if(ctxt->argumentCount() < 2 || ctxt->argumentCount() > 3)
-        return ctxt->throwError("Qt.createQmlObject(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Invalid arguments"));
 
     QDeclarativeContextData* context = activeEnginePriv->getContext(ctxt);
     Q_ASSERT(context);
@@ -1026,7 +1011,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
 
     QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
     if(!parentArg)
-        return ctxt->throwError("Qt.createQmlObject(): Missing parent object");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Missing parent object"));
 
     QDeclarativeComponent component(activeEngine);
     component.setData(qml.toUtf8(), url);
@@ -1051,9 +1036,12 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     }
 
     if (!component.isReady())
-        return ctxt->throwError("Qt.createQmlObject(): Component is not ready");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Component is not ready"));
 
-    QObject *obj = component.create(context->asQDeclarativeContext());
+    QObject *obj = component.beginCreate(context->asQDeclarativeContext());
+    if(obj)
+        QDeclarativeData::get(obj, true)->setImplicitDestructible();
+    component.completeCreate();
 
     if(component.isError()) {
         QList<QDeclarativeError> errors = component.errors();
@@ -1097,18 +1085,18 @@ QScriptValue QDeclarativeEnginePrivate::isQtObject(QScriptContext *ctxt, QScript
 QScriptValue QDeclarativeEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 3)
-        return ctxt->throwError("Qt.vector(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.vector(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     qsreal z = ctxt->argument(2).toNumber();
-    return engine->newVariant(qVariantFromValue(QVector3D(x, y, z)));
+    return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QVector3D(x, y, z)));
 }
 
 QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptEngine*engine)
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDate(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid arguments"));
 
     QDate date = ctxt->argument(0).toDateTime().date();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1119,7 +1107,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatDate(): Invalid date format");
+            return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid date format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1129,7 +1117,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid arguments"));
 
     QTime date = ctxt->argument(0).toDateTime().time();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1140,7 +1128,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatTime(): Invalid time format");
+            return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid time format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1150,7 +1138,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDateTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid arguments"));
 
     QDateTime date = ctxt->argument(0).toDateTime();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1161,7 +1149,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else { 
-            return ctxt->throwError("Qt.formatDateTime(): Invalid datetime format");
+            return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid datetime format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1171,7 +1159,7 @@ QScriptValue QDeclarativeEnginePrivate::rgba(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.rgba(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rgba(): Invalid arguments"));
     qsreal r = ctxt->argument(0).toNumber();
     qsreal g = ctxt->argument(1).toNumber();
     qsreal b = ctxt->argument(2).toNumber();
@@ -1193,7 +1181,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.hsla(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.hsla(): Invalid arguments"));
     qsreal h = ctxt->argument(0).toNumber();
     qsreal s = ctxt->argument(1).toNumber();
     qsreal l = ctxt->argument(2).toNumber();
@@ -1214,7 +1202,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 4)
-        return ctxt->throwError("Qt.rect(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rect(): Invalid arguments"));
 
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
@@ -1224,31 +1212,31 @@ QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine
     if (w < 0 || h < 0)
         return engine->nullValue();
 
-    return qScriptValueFromValue(engine, qVariantFromValue(QRectF(x, y, w, h)));
+    return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QRectF(x, y, w, h)));
 }
 
 QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.point(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.point(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
-    return qScriptValueFromValue(engine, qVariantFromValue(QPointF(x, y)));
+    return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QPointF(x, y)));
 }
 
 QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.size(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.size(): Invalid arguments"));
     qsreal w = ctxt->argument(0).toNumber();
     qsreal h = ctxt->argument(1).toNumber();
-    return qScriptValueFromValue(engine, qVariantFromValue(QSizeF(w, h)));
+    return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QSizeF(w, h)));
 }
 
 QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engine)
 {
-    if(ctxt->argumentCount() != 1)
-        return ctxt->throwError("Qt.lighter(): Invalid arguments");
+    if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
+        return ctxt->throwError(QLatin1String("Qt.lighter(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1260,14 +1248,17 @@ QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEng
             return engine->nullValue();
     } else
         return engine->nullValue();
-    color = color.lighter();
+    qsreal factor = 1.5;
+    if (ctxt->argumentCount() == 2)
+        factor = ctxt->argument(1).toNumber();
+    color = color.lighter(int(qRound(factor*100.)));
     return qScriptValueFromValue(engine, qVariantFromValue(color));
 }
 
 QScriptValue QDeclarativeEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engine)
 {
-    if(ctxt->argumentCount() != 1)
-        return ctxt->throwError("Qt.darker(): Invalid arguments");
+    if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
+        return ctxt->throwError(QLatin1String("Qt.darker(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1279,7 +1270,10 @@ QScriptValue QDeclarativeEnginePrivate::darker(QScriptContext *ctxt, QScriptEngi
             return engine->nullValue();
     } else
         return engine->nullValue();
-    color = color.darker();
+    qsreal factor = 2.0;
+    if (ctxt->argumentCount() == 2)
+        factor = ctxt->argument(1).toNumber();
+    color = color.darker(int(qRound(factor*100.)));
     return qScriptValueFromValue(engine, qVariantFromValue(color));
 }
 
@@ -1294,10 +1288,20 @@ QScriptValue QDeclarativeEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QSc
     return QScriptValue(e, ret);
 }
 
+QScriptValue QDeclarativeEnginePrivate::fontFamilies(QScriptContext *ctxt, QScriptEngine *e)
+{
+    if(ctxt->argumentCount() != 0)
+        return ctxt->throwError(QLatin1String("Qt.fontFamilies(): Invalid arguments"));
+
+    QDeclarativeEnginePrivate *p = QDeclarativeEnginePrivate::get(e);
+    QFontDatabase database;
+    return p->scriptValueFromVariant(database.families());
+}
+
 QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1)
-        return ctxt->throwError("Qt.md5(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.md5(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
     QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
@@ -1308,7 +1312,7 @@ QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.btoa(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.btoa(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1318,7 +1322,7 @@ QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.atob(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.atob(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1419,7 +1423,7 @@ QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptE
 QScriptValue QDeclarativeEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.tint(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.tint(): Invalid arguments"));
     //get color
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
@@ -1522,516 +1526,6 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
     return val.toVariant();
 }
 
-// XXX this beyonds in QUrl::toLocalFile()
-// WARNING, there is a copy of this function in qdeclarativecompositetypemanager.cpp
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    if (url.scheme() == QLatin1String("qrc")) {
-        if (url.authority().isEmpty())
-            return QLatin1Char(':') + url.path();
-        return QString();
-    }
-    return url.toLocalFile();
-}
-
-/////////////////////////////////////////////////////////////
-struct QDeclarativeEnginePrivate::ImportedNamespace {
-    QStringList uris;
-    QStringList urls;
-    QList<int> majversions;
-    QList<int> minversions;
-    QList<bool> isLibrary;
-    QList<QDeclarativeDirComponents> qmlDirComponents;
-
-
-    bool find_helper(int i, const QByteArray& type, int *vmajor, int *vminor,
-                                 QDeclarativeType** type_return, QUrl* url_return,
-                                 QUrl *base = 0, bool *typeRecursionDetected = 0)
-    {
-        int vmaj = majversions.at(i);
-        int vmin = minversions.at(i);
-
-        QByteArray qt = uris.at(i).toUtf8();
-        qt += '/';
-        qt += type;
-
-        QDeclarativeType *t = QDeclarativeMetaType::qmlType(qt,vmaj,vmin);
-        if (t) {
-            if (vmajor) *vmajor = vmaj;
-            if (vminor) *vminor = vmin;
-            if (type_return)
-                *type_return = t;
-            return true;
-        }
-
-        QUrl url = QUrl(urls.at(i) + QLatin1Char('/') + QString::fromUtf8(type) + QLatin1String(".qml"));
-        QDeclarativeDirComponents qmldircomponents = qmlDirComponents.at(i);
-
-        bool typeWasDeclaredInQmldir = false;
-        if (!qmldircomponents.isEmpty()) {
-            const QString typeName = QString::fromUtf8(type);
-            foreach (const QDeclarativeDirParser::Component &c, qmldircomponents) {
-                if (c.typeName == typeName) {
-                    typeWasDeclaredInQmldir = true;
-
-                    // importing version -1 means import ALL versions
-                    if ((vmaj == -1) || (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion))) {
-                        QUrl candidate = url.resolved(QUrl(c.fileName));
-                        if (c.internal && base) {
-                            if (base->resolved(QUrl(c.fileName)) != candidate)
-                                continue; // failed attempt to access an internal type
-                        }
-                        if (base && *base == candidate) {
-                            if (typeRecursionDetected)
-                                *typeRecursionDetected = true;
-                            continue; // no recursion
-                        }
-                        if (url_return)
-                            *url_return = candidate;
-                        return true;
-                    }
-                }
-            }
-        }
-
-        if (!typeWasDeclaredInQmldir  && !isLibrary.at(i)) {
-            // XXX search non-files too! (eg. zip files, see QT-524)
-            QFileInfo f(toLocalFileOrQrc(url));
-            if (f.exists()) {
-                if (base && *base == url) { // no recursion
-                    if (typeRecursionDetected)
-                        *typeRecursionDetected = true;
-                } else {
-                    if (url_return)
-                        *url_return = url;
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    bool find(const QByteArray& type, int *vmajor, int *vminor, QDeclarativeType** type_return,
-              QUrl* url_return, QUrl *base = 0, QString *errorString = 0)
-    {
-        bool typeRecursionDetected = false;
-        for (int i=0; i<urls.count(); ++i) {
-            if (find_helper(i, type, vmajor, vminor, type_return, url_return, base, &typeRecursionDetected)) {
-                if (qmlCheckTypes()) {
-                    // check for type clashes
-                    for (int j = i+1; j<urls.count(); ++j) {
-                        if (find_helper(j, type, vmajor, vminor, 0, 0, base)) {
-                            if (errorString) {
-                                QString u1 = urls.at(i);
-                                QString u2 = urls.at(j);
-                                if (base) {
-                                    QString b = base->toString();
-                                    int slash = b.lastIndexOf(QLatin1Char('/'));
-                                    if (slash >= 0) {
-                                        b = b.left(slash+1);
-                                        QString l = b.left(slash);
-                                        if (u1.startsWith(b))
-                                            u1 = u1.mid(b.count());
-                                        else if (u1 == l)
-                                            u1 = QDeclarativeEngine::tr("local directory");
-                                        if (u2.startsWith(b))
-                                            u2 = u2.mid(b.count());
-                                        else if (u2 == l)
-                                            u2 = QDeclarativeEngine::tr("local directory");
-                                    }
-                                }
-
-                                if (u1 != u2)
-                                    *errorString
-                                            = QDeclarativeEngine::tr("is ambiguous. Found in %1 and in %2")
-                                    .arg(u1).arg(u2);
-                                else
-                                    *errorString
-                                            = QDeclarativeEngine::tr("is ambiguous. Found in %1 in version %2.%3 and %4.%5")
-                                              .arg(u1)
-                                              .arg(majversions.at(i)).arg(minversions.at(i))
-                                              .arg(majversions.at(j)).arg(minversions.at(j));
-                            }
-                            return false;
-                        }
-                    }
-                }
-                return true;
-            }
-        }
-        if (errorString) {
-            if (typeRecursionDetected)
-                *errorString = QDeclarativeEngine::tr("is instantiated recursively");
-            else
-                *errorString = QDeclarativeEngine::tr("is not a type");
-        }
-        return false;
-    }
-};
-
-static bool greaterThan(const QString &s1, const QString &s2)
-{
-    return s1 > s2;
-}
-
-class QDeclarativeImportsPrivate {
-public:
-    QDeclarativeImportsPrivate() : ref(1)
-    {
-    }
-
-    ~QDeclarativeImportsPrivate()
-    {
-        foreach (QDeclarativeEnginePrivate::ImportedNamespace* s, set.values())
-            delete s;
-    }
-
-    QSet<QString> qmlDirFilesForWhichPluginsHaveBeenLoaded;
-
-    bool importExtension(const QString &absoluteFilePath, const QString &uri, QDeclarativeEngine *engine, QDeclarativeDirComponents* components, QString *errorString) {
-        QFile file(absoluteFilePath);
-        QString filecontent;
-        if (file.open(QFile::ReadOnly)) {
-            filecontent = QString::fromUtf8(file.readAll());
-            if (qmlImportTrace())
-                qDebug() << "QDeclarativeEngine::add: loaded" << absoluteFilePath;
-        } else {
-            if (errorString)
-                *errorString = QDeclarativeEngine::tr("module \"%1\" definition \"%2\" not readable").arg(uri).arg(absoluteFilePath);
-            return false;
-        }
-        QDir dir = QFileInfo(file).dir();
-
-        QDeclarativeDirParser qmldirParser;
-        qmldirParser.setSource(filecontent);
-        qmldirParser.parse();
-
-        if (! qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(absoluteFilePath)) {
-            qmlDirFilesForWhichPluginsHaveBeenLoaded.insert(absoluteFilePath);
-
-
-            foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser.plugins()) {
-
-                QString resolvedFilePath =
-                        QDeclarativeEnginePrivate::get(engine)
-                        ->resolvePlugin(dir, plugin.path,
-                                        plugin.name);
-
-                if (!resolvedFilePath.isEmpty()) {
-                    if (!engine->importPlugin(resolvedFilePath, uri, errorString)) {
-                        if (errorString)
-                            *errorString = QDeclarativeEngine::tr("plugin cannot be loaded for module \"%1\": %2").arg(uri).arg(*errorString);
-                        return false;
-                    }
-                } else {
-                    if (errorString)
-                        *errorString = QDeclarativeEngine::tr("module \"%1\" plugin \"%2\" not found").arg(uri).arg(plugin.name);
-                    return false;
-                }
-            }
-        }
-
-        if (components)
-            *components = qmldirParser.components();
-
-        return true;
-    }
-
-    QString resolvedUri(const QString &dir_arg, QDeclarativeEngine *engine)
-    {
-        QString dir = dir_arg;
-        if (dir.endsWith(QLatin1Char('/')) || dir.endsWith(QLatin1Char('\\')))
-            dir.chop(1);
-
-        QStringList paths = QDeclarativeEnginePrivate::get(engine)->fileImportPath;
-        qSort(paths.begin(), paths.end(), greaterThan); // Ensure subdirs preceed their parents.
-
-        QString stableRelativePath = dir;
-        foreach( QString path, paths) {
-            if (dir.startsWith(path)) {
-                stableRelativePath = dir.mid(path.length()+1);
-                break;
-            }
-        }
-        stableRelativePath.replace(QLatin1Char('/'), QLatin1Char('.'));
-        stableRelativePath.replace(QLatin1Char('\\'), QLatin1Char('.'));
-        return stableRelativePath;
-    }
-
-
-
-
-    bool add(const QUrl& base, const QDeclarativeDirComponents &qmldircomponentsnetwork, const QString& uri_arg, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType, QDeclarativeEngine *engine, QString *errorString)
-    {
-        QDeclarativeDirComponents qmldircomponents = qmldircomponentsnetwork;
-        QString uri = uri_arg;
-        QDeclarativeEnginePrivate::ImportedNamespace *s;
-        if (prefix.isEmpty()) {
-            s = &unqualifiedset;
-        } else {
-            s = set.value(prefix);
-            if (!s)
-                set.insert(prefix,(s=new QDeclarativeEnginePrivate::ImportedNamespace));
-        }
-
-
-
-        QString url = uri;
-        if (importType == QDeclarativeScriptParser::Import::Library) {
-            url.replace(QLatin1Char('.'), QLatin1Char('/'));
-            bool found = false;
-            QString dir;
-
-
-            foreach (const QString &p,
-                     QDeclarativeEnginePrivate::get(engine)->fileImportPath) {
-                dir = p+QLatin1Char('/')+url;
-
-                QFileInfo fi(dir+QLatin1String("/qmldir"));
-                const QString absoluteFilePath = fi.absoluteFilePath();
-
-                if (fi.isFile()) {
-                    found = true;
-
-                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
-                    uri = resolvedUri(dir, engine);
-                    if (!importExtension(absoluteFilePath, uri, engine, &qmldircomponents, errorString))
-                        return false;
-                    break;
-                }
-            }
-
-            if (!found) {
-                found = QDeclarativeMetaType::isModule(uri.toUtf8(), vmaj, vmin);
-                if (!found) {
-                    if (errorString) {
-                        bool anyversion = QDeclarativeMetaType::isModule(uri.toUtf8(), -1, -1);
-                        if (anyversion)
-                            *errorString = QDeclarativeEngine::tr("module \"%1\" version %2.%3 is not installed").arg(uri_arg).arg(vmaj).arg(vmin);
-                        else
-                            *errorString = QDeclarativeEngine::tr("module \"%1\" is not installed").arg(uri_arg);
-                    }
-                    return false;
-                }
-            }
-        } else {
-
-            if (importType == QDeclarativeScriptParser::Import::File && qmldircomponents.isEmpty()) {
-                QUrl importUrl = base.resolved(QUrl(uri + QLatin1String("/qmldir")));
-                QString localFileOrQrc = toLocalFileOrQrc(importUrl);
-                if (!localFileOrQrc.isEmpty()) {
-                    QString dir = toLocalFileOrQrc(base.resolved(QUrl(uri)));
-                    if (dir.isEmpty() || !QDir().exists(dir)) {
-                        if (errorString)
-                            *errorString = QDeclarativeEngine::tr("\"%1\": no such directory").arg(uri_arg);
-                        return false; // local import dirs must exist
-                    }
-                    uri = resolvedUri(toLocalFileOrQrc(base.resolved(QUrl(uri))), engine);
-                    if (uri.endsWith(QLatin1Char('/')))
-                        uri.chop(1);
-                    if (QFile::exists(localFileOrQrc)) {
-                        if (!importExtension(localFileOrQrc,uri,engine,&qmldircomponents,errorString))
-                            return false;
-                    }
-                } else {
-                    if (prefix.isEmpty()) {
-                        // directory must at least exist for valid import
-                        QString localFileOrQrc = toLocalFileOrQrc(base.resolved(QUrl(uri)));
-                        if (localFileOrQrc.isEmpty() || !QDir().exists(localFileOrQrc)) {
-                            if (errorString) {
-                                if (localFileOrQrc.isEmpty())
-                                    *errorString = QDeclarativeEngine::tr("import \"%1\" has no qmldir and no namespace").arg(uri);
-                                else
-                                    *errorString = QDeclarativeEngine::tr("\"%1\": no such directory").arg(uri);
-                            }
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            url = base.resolved(QUrl(url)).toString();
-            if (url.endsWith(QLatin1Char('/')))
-                url.chop(1);
-        }
-
-        if (vmaj > -1 && vmin > -1 && !qmldircomponents.isEmpty()) {
-            QList<QDeclarativeDirParser::Component>::ConstIterator it = qmldircomponents.begin();
-            for (; it != qmldircomponents.end(); ++it) {
-                if (it->majorVersion > vmaj || (it->majorVersion == vmaj && it->minorVersion >= vmin))
-                    break;
-            }
-            if (it == qmldircomponents.end()) {
-                *errorString = QDeclarativeEngine::tr("module \"%1\" version %2.%3 is not installed").arg(uri_arg).arg(vmaj).arg(vmin);
-                return false;
-            }
-        }
-
-        s->uris.prepend(uri);
-        s->urls.prepend(url);
-        s->majversions.prepend(vmaj);
-        s->minversions.prepend(vmin);
-        s->isLibrary.prepend(importType == QDeclarativeScriptParser::Import::Library);
-        s->qmlDirComponents.prepend(qmldircomponents);
-        return true;
-    }
-
-    bool find(const QByteArray& type, int *vmajor, int *vminor, QDeclarativeType** type_return,
-              QUrl* url_return, QString *errorString)
-    {
-        QDeclarativeEnginePrivate::ImportedNamespace *s = 0;
-        int slash = type.indexOf('/');
-        if (slash >= 0) {
-            QString namespaceName = QString::fromUtf8(type.left(slash));
-            s = set.value(namespaceName);
-            if (!s) {
-                if (errorString)
-                    *errorString = QDeclarativeEngine::tr("- %1 is not a namespace").arg(namespaceName);
-                return false;
-            }
-            int nslash = type.indexOf('/',slash+1);
-            if (nslash > 0) {
-                if (errorString)
-                    *errorString = QDeclarativeEngine::tr("- nested namespaces not allowed");
-                return false;
-            }
-        } else {
-            s = &unqualifiedset;
-        }
-        QByteArray unqualifiedtype = slash < 0 ? type : type.mid(slash+1); // common-case opt (QString::mid works fine, but slower)
-        if (s) {
-            if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return, &base, errorString))
-                return true;
-            if (s->urls.count() == 1 && !s->isLibrary[0] && url_return && s != &unqualifiedset) {
-                // qualified, and only 1 url
-                *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    QDeclarativeEnginePrivate::ImportedNamespace *findNamespace(const QString& type)
-    {
-        return set.value(type);
-    }
-
-    QUrl base;
-    int ref;
-
-private:
-    friend struct QDeclarativeEnginePrivate::Imports;
-    QDeclarativeEnginePrivate::ImportedNamespace unqualifiedset;
-    QHash<QString,QDeclarativeEnginePrivate::ImportedNamespace* > set;
-};
-
-QDeclarativeEnginePrivate::Imports::Imports(const Imports &copy) :
-    d(copy.d)
-{
-    ++d->ref;
-}
-
-QDeclarativeEnginePrivate::Imports &QDeclarativeEnginePrivate::Imports::operator =(const Imports &copy)
-{
-    ++copy.d->ref;
-    if (--d->ref == 0)
-        delete d;
-    d = copy.d;
-    return *this;
-}
-
-QDeclarativeEnginePrivate::Imports::Imports() :
-    d(new QDeclarativeImportsPrivate)
-{
-}
-
-QDeclarativeEnginePrivate::Imports::~Imports()
-{
-    if (--d->ref == 0)
-        delete d;
-}
-
-static QDeclarativeTypeNameCache *cacheForNamespace(QDeclarativeEngine *engine, const QDeclarativeEnginePrivate::ImportedNamespace &set, QDeclarativeTypeNameCache *cache)
-{
-    if (!cache)
-        cache = new QDeclarativeTypeNameCache(engine);
-
-    QList<QDeclarativeType *> types = QDeclarativeMetaType::qmlTypes();
-
-    for (int ii = 0; ii < set.uris.count(); ++ii) {
-        QByteArray base = set.uris.at(ii).toUtf8() + '/';
-        int major = set.majversions.at(ii);
-        int minor = set.minversions.at(ii);
-
-        foreach (QDeclarativeType *type, types) {
-            if (type->qmlTypeName().startsWith(base) &&
-                type->qmlTypeName().lastIndexOf('/') == (base.length() - 1) &&
-                type->availableInVersion(major,minor))
-            {
-                QString name = QString::fromUtf8(type->qmlTypeName().mid(base.length()));
-
-                cache->add(name, type);
-            }
-        }
-    }
-
-    return cache;
-}
-
-void QDeclarativeEnginePrivate::Imports::cache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *engine) const
-{
-    const QDeclarativeEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
-
-    for (QHash<QString,QDeclarativeEnginePrivate::ImportedNamespace* >::ConstIterator iter = d->set.begin();
-         iter != d->set.end(); ++iter) {
-
-        QDeclarativeTypeNameCache::Data *d = cache->data(iter.key());
-        if (d) {
-            if (!d->typeNamespace)
-                cacheForNamespace(engine, *(*iter), d->typeNamespace);
-        } else {
-            QDeclarativeTypeNameCache *nc = cacheForNamespace(engine, *(*iter), 0);
-            cache->add(iter.key(), nc);
-            nc->release();
-        }
-    }
-
-    cacheForNamespace(engine, set, cache);
-}
-
-/*
-QStringList QDeclarativeEnginePrivate::Imports::unqualifiedSet() const
-{
-    QStringList rv;
-
-    const QDeclarativeEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
-
-    for (int ii = 0; ii < set.urls.count(); ++ii) {
-        if (set.isBuiltin.at(ii))
-            rv << set.urls.at(ii);
-    }
-
-    return rv;
-}
-*/
-
-/*!
-  Sets the base URL to be used for all relative file imports added.
-*/
-void QDeclarativeEnginePrivate::Imports::setBaseUrl(const QUrl& url)
-{
-    d->base = url;
-}
-
-/*!
-  Returns the base URL to be used for all relative file imports added.
-*/
-QUrl QDeclarativeEnginePrivate::Imports::baseUrl() const
-{
-    return d->base;
-}
-
 /*!
   Adds \a path as a directory where the engine searches for
   installed modules in a URL-based directory structure.
@@ -2042,19 +1536,10 @@ QUrl QDeclarativeEnginePrivate::Imports::baseUrl() const
 */
 void QDeclarativeEngine::addImportPath(const QString& path)
 {
-    if (qmlImportTrace())
-        qDebug() << "QDeclarativeEngine::addImportPath" << path;
     Q_D(QDeclarativeEngine);
-    QUrl url = QUrl(path);
-    if (url.isRelative() || url.scheme() == QString::fromLocal8Bit("file")) {
-        QDir dir = QDir(path);
-        d->fileImportPath.prepend(dir.canonicalPath());
-    } else {
-        d->fileImportPath.prepend(path);
-    }
+    d->importDatabase.addImportPath(path);
 }
 
-
 /*!
   Returns the list of directories where the engine searches for
   installed modules in a URL-based directory structure.
@@ -2073,11 +1558,11 @@ void QDeclarativeEngine::addImportPath(const QString& path)
 QStringList QDeclarativeEngine::importPathList() const
 {
     Q_D(const QDeclarativeEngine);
-    return d->fileImportPath;
+    return d->importDatabase.importPathList();
 }
 
 /*!
-  Sets the list of directories where the engine searches for
+  Sets \a paths as the list of directories where the engine searches for
   installed modules in a URL-based directory structure.
 
   By default, the list contains the paths specified in the \c QML_IMPORT_PATH environment
@@ -2088,7 +1573,7 @@ QStringList QDeclarativeEngine::importPathList() const
 void QDeclarativeEngine::setImportPathList(const QStringList &paths)
 {
     Q_D(QDeclarativeEngine);
-    d->fileImportPath = paths;
+    d->importDatabase.setImportPathList(paths);
 }
 
 
@@ -2105,16 +1590,8 @@ void QDeclarativeEngine::setImportPathList(const QStringList &paths)
 */
 void QDeclarativeEngine::addPluginPath(const QString& path)
 {
-    if (qmlImportTrace())
-        qDebug() << "QDeclarativeEngine::addPluginPath" << path;
     Q_D(QDeclarativeEngine);
-    QUrl url = QUrl(path);
-    if (url.isRelative() || url.scheme() == QString::fromLocal8Bit("file")) {
-        QDir dir = QDir(path);
-        d->filePluginPath.prepend(dir.canonicalPath());
-    } else {
-        d->filePluginPath.prepend(path);
-    }
+    d->importDatabase.addPluginPath(path);
 }
 
 
@@ -2130,7 +1607,7 @@ void QDeclarativeEngine::addPluginPath(const QString& path)
 QStringList QDeclarativeEngine::pluginPathList() const
 {
     Q_D(const QDeclarativeEngine);
-    return d->filePluginPath;
+    return d->importDatabase.pluginPathList();
 }
 
 /*!
@@ -2146,7 +1623,7 @@ QStringList QDeclarativeEngine::pluginPathList() const
 void QDeclarativeEngine::setPluginPathList(const QStringList &paths)
 {
     Q_D(QDeclarativeEngine);
-    d->filePluginPath = paths;
+    d->importDatabase.setPluginPathList(paths);
 }
 
 
@@ -2160,55 +1637,8 @@ void QDeclarativeEngine::setPluginPathList(const QStringList &paths)
 */
 bool QDeclarativeEngine::importPlugin(const QString &filePath, const QString &uri, QString *errorString)
 {
-    if (qmlImportTrace())
-        qDebug() << "QDeclarativeEngine::importPlugin" << uri << "from" << filePath;
-    QFileInfo fileInfo(filePath);
-    const QString absoluteFilePath = fileInfo.absoluteFilePath();
-
-    QDeclarativeEnginePrivate *d = QDeclarativeEnginePrivate::get(this);
-    bool engineInitialized = d->initializedPlugins.contains(absoluteFilePath);
-    bool typesRegistered = qmlEnginePluginsWithRegisteredTypes()->contains(absoluteFilePath);
-
-    if (typesRegistered) {
-        Q_ASSERT_X(qmlEnginePluginsWithRegisteredTypes()->value(absoluteFilePath) == uri,
-                   "QDeclarativeEngine::importExtension",
-                   "Internal error: Plugin imported previously with different uri");
-    }
-
-    if (!engineInitialized || !typesRegistered) {
-        QPluginLoader loader(absoluteFilePath);
-
-        if (!loader.load()) {
-            if (errorString)
-                *errorString = loader.errorString();
-            return false;
-        }
-
-        if (QDeclarativeExtensionInterface *iface = qobject_cast<QDeclarativeExtensionInterface *>(loader.instance())) {
-
-            const QByteArray bytes = uri.toUtf8();
-            const char *moduleId = bytes.constData();
-            if (!typesRegistered) {
-
-                // ### this code should probably be protected with a mutex.
-                qmlEnginePluginsWithRegisteredTypes()->insert(absoluteFilePath, uri);
-                iface->registerTypes(moduleId);
-            }
-            if (!engineInitialized) {
-                // things on the engine (eg. adding new global objects) have to be done for every engine.
-
-                // protect against double initialization
-                d->initializedPlugins.insert(absoluteFilePath);
-                iface->initializeEngine(this, moduleId);
-            }
-        } else {
-            if (errorString)
-                *errorString = loader.errorString();
-            return false;
-        }
-    }
-
-    return true;
+    Q_D(QDeclarativeEngine);
+    return d->importDatabase.importPlugin(filePath, uri, errorString);
 }
 
 /*!
@@ -2240,208 +1670,6 @@ QString QDeclarativeEngine::offlineStoragePath() const
     return d->scriptEngine.offlineStoragePath;
 }
 
-/*!
-  \internal
-
-  Returns the result of the merge of \a baseName with \a path, \a suffixes, and \a prefix.
-  The \a prefix must contain the dot.
-
-  \a qmldirPath is the location of the qmldir file.
- */
-QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, const QString &baseName,
-                                        const QStringList &suffixes,
-                                        const QString &prefix)
-{
-    QStringList searchPaths = filePluginPath;
-    bool qmldirPluginPathIsRelative = QDir::isRelativePath(qmldirPluginPath);
-    if (!qmldirPluginPathIsRelative)
-        searchPaths.prepend(qmldirPluginPath);
-
-    foreach (const QString &pluginPath, searchPaths) {
-
-        QString resolvedPath;
-
-        if (pluginPath == QLatin1String(".")) {
-            if (qmldirPluginPathIsRelative)
-                resolvedPath = qmldirPath.absoluteFilePath(qmldirPluginPath);
-            else
-                resolvedPath = qmldirPath.absolutePath();
-        } else {
-            resolvedPath = pluginPath;
-        }
-
-        // hack for resources, should probably go away
-        if (resolvedPath.startsWith(QLatin1Char(':')))
-            resolvedPath = QCoreApplication::applicationDirPath();
-
-        QDir dir(resolvedPath);
-        foreach (const QString &suffix, suffixes) {
-            QString pluginFileName = prefix;
-
-            pluginFileName += baseName;
-            pluginFileName += suffix;
-
-            QFileInfo fileInfo(dir, pluginFileName);
-
-            if (fileInfo.exists())
-                return fileInfo.absoluteFilePath();
-        }
-    }
-
-    if (qmlImportTrace())
-        qDebug() << "QDeclarativeEngine::resolvePlugin: Could not resolve plugin" << baseName << "in" << qmldirPath.absolutePath();
-    return QString();
-}
-
-/*!
-  \internal
-
-  Returns the result of the merge of \a baseName with \a dir and the platform suffix.
-
-  \table
-  \header \i Platform \i Valid suffixes
-  \row \i Windows     \i \c .dll
-  \row \i Unix/Linux  \i \c .so
-  \row \i AIX  \i \c .a
-  \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)
-  \row \i Mac OS X    \i \c .dylib, \c .bundle, \c .so
-  \row \i Symbian     \i \c .dll
-  \endtable
-
-  Version number on unix are ignored.
-*/
-QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, const QString &baseName)
-{
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-    return resolvePlugin(qmldirPath, qmldirPluginPath, baseName,
-                         QStringList()
-# ifdef QT_DEBUG
-                         << QLatin1String("d.dll") // try a qmake-style debug build first
-# endif
-                         << QLatin1String(".dll"));
-#elif defined(Q_OS_SYMBIAN)
-    return resolvePlugin(qmldirPath, qmldirPluginPath, baseName,
-                         QStringList()
-                         << QLatin1String(".dll")
-                         << QLatin1String(".qtplugin"));
-#else
-
-# if defined(Q_OS_DARWIN)
-
-    return resolvePlugin(qmldirPath, qmldirPluginPath, baseName,
-                         QStringList()
-# ifdef QT_DEBUG
-                         << QLatin1String("_debug.dylib") // try a qmake-style debug build first
-                         << QLatin1String(".dylib")
-# else
-                         << QLatin1String(".dylib")
-                         << QLatin1String("_debug.dylib") // try a qmake-style debug build after
-# endif
-                         << QLatin1String(".so")
-                         << QLatin1String(".bundle"),
-                         QLatin1String("lib"));
-# else  // Generic Unix
-    QStringList validSuffixList;
-
-#  if defined(Q_OS_HPUX)
-/*
-    See "HP-UX Linker and Libraries User's Guide", section "Link-time Differences between PA-RISC and IPF":
-    "In PA-RISC (PA-32 and PA-64) shared libraries are suffixed with .sl. In IPF (32-bit and 64-bit),
-    the shared libraries are suffixed with .so. For compatibility, the IPF linker also supports the .sl suffix."
- */
-    validSuffixList << QLatin1String(".sl");
-#   if defined __ia64
-    validSuffixList << QLatin1String(".so");
-#   endif
-#  elif defined(Q_OS_AIX)
-    validSuffixList << QLatin1String(".a") << QLatin1String(".so");
-#  elif defined(Q_OS_UNIX)
-    validSuffixList << QLatin1String(".so");
-#  endif
-
-    // Examples of valid library names:
-    //  libfoo.so
-
-    return resolvePlugin(qmldirPath, qmldirPluginPath, baseName, validSuffixList, QLatin1String("lib"));
-# endif
-
-#endif
-}
-
-/*!
-  \internal
-
-  Adds information to \a imports such that subsequent calls to resolveType()
-  will resolve types qualified by \a prefix by considering types found at the given \a uri.
-
-  The uri is either a directory (if importType is FileImport), or a URI resolved using paths
-  added via addImportPath() (if importType is LibraryImport).
-
-  The \a prefix may be empty, in which case the import location is considered for
-  unqualified types.
-
-  The base URL must already have been set with Import::setBaseUrl().
-*/
-bool QDeclarativeEnginePrivate::addToImport(Imports* imports, const QDeclarativeDirComponents &qmldircomponentsnetwork, const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType, QString *errorString) const
-{
-    QDeclarativeEngine *engine = QDeclarativeEnginePrivate::get(const_cast<QDeclarativeEnginePrivate *>(this));
-    if (qmlImportTrace())
-        qDebug().nospace() << "QDeclarativeEngine::addToImport " << imports << " " << uri << " " << vmaj << '.' << vmin << " " << (importType==QDeclarativeScriptParser::Import::Library? "Library" : "File") << " as " << prefix;
-    bool ok = imports->d->add(imports->d->base,qmldircomponentsnetwork, uri,prefix,vmaj,vmin,importType, engine, errorString);
-    return ok;
-}
-
-/*!
-  \internal
-
-  Using the given \a imports, the given (namespace qualified) \a type is resolved to either
-  an ImportedNamespace stored at \a ns_return,
-  a QDeclarativeType stored at \a type_return, or
-  a component located at \a url_return.
-
-  If any return pointer is 0, the corresponding search is not done.
-
-  \sa addToImport()
-*/
-bool QDeclarativeEnginePrivate::resolveType(const Imports& imports, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin, ImportedNamespace** ns_return, QString *errorString) const
-{
-    ImportedNamespace* ns = imports.d->findNamespace(QString::fromUtf8(type));
-    if (ns) {
-        if (ns_return)
-            *ns_return = ns;
-        return true;
-    }
-    if (type_return || url_return) {
-        if (imports.d->find(type,vmaj,vmin,type_return,url_return, errorString)) {
-            if (qmlImportTrace()) {
-                if (type_return && *type_return && url_return && !url_return->isEmpty())
-                    qDebug() << "QDeclarativeEngine::resolveType" << type << '=' << (*type_return)->typeName() << *url_return;
-                if (type_return && *type_return)
-                    qDebug() << "QDeclarativeEngine::resolveType" << type << '=' << (*type_return)->typeName();
-                if (url_return && !url_return->isEmpty())
-                    qDebug() << "QDeclarativeEngine::resolveType" << type << '=' << *url_return;
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-/*!
-  \internal
-
-  Searching \e only in the namespace \a ns (previously returned in a call to
-  resolveType(), \a type is found and returned to either
-  a QDeclarativeType stored at \a type_return, or
-  a component located at \a url_return.
-
-  If either return pointer is 0, the corresponding search is not done.
-*/
-void QDeclarativeEnginePrivate::resolveTypeInNamespace(ImportedNamespace* ns, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin ) const
-{
-    ns->find(type,vmaj,vmin,type_return,url_return);
-}
-
 static void voidptr_destructor(void *v)
 {
     void **ptr = (void **)v;