From 883dc50950e6109d0cfb7a42e144d529076b9be3 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Mon, 26 Oct 2009 16:55:26 +1000
Subject: Compile with -no-qt3support

---
 src/declarative/qml/qmlcompositetypemanager.cpp | 2 +-
 src/declarative/qml/qmlengine.cpp               | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index b335d31..075c359 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -459,7 +459,7 @@ int QmlCompositeTypeManager::resolveTypes(QmlCompositeTypeData *unit)
         if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) {
             QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir")));
             for (int ii = 0; ii < unit->resources.count(); ++ii) {
-                if (unit->resources.at(ii)->url == importUrl) {
+                if (unit->resources.at(ii)->url == importUrl.toString()) {
                     qmldir = QString::fromUtf8(unit->resources.at(ii)->data);
                     break;
                 }
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index df865f1..ab3c23a 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -39,8 +39,6 @@
 **
 ****************************************************************************/
 
-#undef QT3_SUPPORT // don't want it here - it just causes bugs (which is why we removed it)
-
 #include <QtCore/qmetaobject.h>
 #include <private/qmlengine_p.h>
 #include <private/qmlcontext_p.h>
-- 
cgit v0.12