From 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb Mon Sep 17 00:00:00 2001
From: Damian Jansen <damian.jansen@nokia.com>
Date: Wed, 19 Oct 2011 15:04:15 +1000
Subject: Remove Q_WS_*, symbian and maemo code in QtDeclarative

Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
 src/declarative/qml/qdeclarativeimport.cpp | 44 +-----------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

(limited to 'src/declarative/qml/qdeclarativeimport.cpp')

diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index f94e9e4bae..0a03443acc 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -51,10 +51,6 @@
 #include <private/qdeclarativetypenamecache_p.h>
 #include <private/qdeclarativeengine_p.h>
 
-#ifdef Q_OS_SYMBIAN
-#include <private/qcore_symbian_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
@@ -382,13 +378,6 @@ bool QDeclarativeImportsPrivate::importExtension(const QString &absoluteFilePath
         foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser->plugins()) {
 
             QString resolvedFilePath = database->resolvePlugin(typeLoader, qmldirPath, plugin.path, plugin.name);
-#if defined(QT_LIBINFIX) && defined(Q_OS_SYMBIAN)
-            if (resolvedFilePath.isEmpty()) {
-                // In case of libinfixed build, attempt to load libinfixed version, too.
-                QString infixedPluginName = plugin.name + QLatin1String(QT_LIBINFIX);
-                resolvedFilePath = database->resolvePlugin(dir, plugin.path, infixedPluginName);
-            }
-#endif
             if (!resolvedFilePath.isEmpty()) {
                 if (!database->importPlugin(resolvedFilePath, uri, errors)) {
                     if (errors) {
@@ -751,38 +740,13 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e)
 
 #ifndef QT_NO_SETTINGS
     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::ImportsPath);
-
-#if defined(Q_OS_SYMBIAN)
-    // Append imports path for all available drives in Symbian
-    if (installImportsPath.at(1) != QChar(QLatin1Char(':'))) {
-        QString tempPath = installImportsPath;
-        if (tempPath.at(tempPath.length() - 1) != QDir::separator()) {
-            tempPath += QDir::separator();
-        }
-        RFs& fs = qt_s60GetRFs();
-        TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData()));
-        TFindFile finder(fs);
-        TInt err = finder.FindByDir(tempPathPtr, tempPathPtr);
-        while (err == KErrNone) {
-            QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()),
-                             finder.File().Length());
-            foundDir = QDir(foundDir).canonicalPath();
-            addImportPath(foundDir);
-            err = finder.Find();
-        }
-    } else {
-        addImportPath(installImportsPath);
-    }
-#else
     addImportPath(installImportsPath);
-#endif
-
 #endif // QT_NO_SETTINGS
 
     // env import paths
     QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
     if (!envImportPath.isEmpty()) {
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
         QLatin1Char pathSep(';');
 #else
         QLatin1Char pathSep(':');
@@ -899,7 +863,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(QDeclarativeTypeLoader *typeLo
   \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.
@@ -915,11 +878,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(QDeclarativeTypeLoader *typeLo
                          << QLatin1String("d.dll") // try a qmake-style debug build first
 # endif
                          << QLatin1String(".dll"));
-#elif defined(Q_OS_SYMBIAN)
-    return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName,
-                         QStringList()
-                         << QLatin1String(".dll")
-                         << QLatin1String(".qtplugin"));
 #else
 
 # if defined(Q_OS_DARWIN)
-- 
cgit v1.2.3