Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 2 insertions, 6 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 7f8bc7a..3b2009a 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2776,9 +2776,6 @@ QmlType *QmlCompiler::toQmlType(QmlParser::Object *from)
 
 QStringList QmlCompiler::deferredProperties(QmlParser::Object *obj)
 {
-    if (!qmlExperimental())
-        return QStringList();
-
     const QMetaObject *mo = obj->metatype;
 
     int idx = mo->indexOfClassInfo("DeferredPropertyNames");
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 5479463..2d86e09 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1299,11 +1299,11 @@ static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePri
 
     QList<QmlType *> types = QmlMetaType::qmlTypes();
 
-    for (int ii = 0; ii < set.urls.count(); ++ii) {
+    for (int ii = 0; ii < set.uris.count(); ++ii) {
         if (!set.isBuiltin.at(ii))
             continue;
 
-        QByteArray base = set.urls.at(ii).toUtf8() + '/';
+        QByteArray base = set.uris.at(ii).toUtf8() + '/';
         int major = set.majversions.at(ii);
         int minor = set.minversions.at(ii);
 
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index 56c500c..bf95a54 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -743,7 +743,6 @@ void tst_qmllanguage::cppnamespace()
 
     {
         QmlComponent component(&engine, TEST_FILE("cppnamespace.2.qml"));
-        qWarning() << component.errors();
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);