From 75af1ec1a9840e64d2117475231cd1f359f03d68 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 15 Jul 2009 09:52:20 +1000
Subject: Remove bogus use of QT3_SUPPORT.

---
 src/declarative/qml/qmlengine.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index b0369e3..46c8b30 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1155,7 +1155,7 @@ public:
         return true;
     }
 
-    QUrl find(const QString& base, const QString& type)
+    QUrl find(const QUrl& base, const QString& type)
     {
         TypeSet *s = 0;
         int slash = type.indexOf(QLatin1Char('/'));
@@ -1172,10 +1172,9 @@ public:
             s = &unqualifiedset;
         }
         QString unqualifiedtype = type.mid(slash+1);
-        QUrl baseUrl(base);
         if (s) {
             for (int i=0; i<s->urls.count(); ++i) {
-                QUrl url = baseUrl.resolved(QUrl(s->urls.at(i) +QLatin1String("/")+ unqualifiedtype + QLatin1String(".qml")));
+                QUrl url = base.resolved(QUrl(s->urls.at(i) +QLatin1String("/")+ unqualifiedtype + QLatin1String(".qml")));
                 QString version = s->versions.at(i);
                 // XXX search non-files too! (eg. zip files, see QT-524)
                 QFileInfo f(url.toLocalFile());
@@ -1209,10 +1208,10 @@ public:
                 }
             }
         }
-        return baseUrl.resolved(QUrl(type + QLatin1String(".qml")));
+        return base.resolved(QUrl(type + QLatin1String(".qml")));
     }
 
-    QmlType *findBuiltin(const QString&, const QByteArray& type)
+    QmlType *findBuiltin(const QUrl& base, const QByteArray& type)
     {
         TypeSet *s = 0;
         int slash = type.indexOf('/');
-- 
cgit v0.12