From abfb755d7a8ff7f94d4dc59d37ac9934702254bd Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 11 Jan 2010 15:08:20 +1000 Subject: Remove debugging --- tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp | 1 - 1 file changed, 1 deletion(-) 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); -- cgit v0.12 From ac6c8a4d8870011cf7d999d8999d0e9c61e9e89e Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 11 Jan 2010 15:41:50 +1000 Subject: Use URI, not modified URL when resolving type names --- src/declarative/qml/qmlengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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); -- cgit v0.12 From 8fa3f3f7f038f10dcd2bbd160f04275fe0efaadf Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 11 Jan 2010 15:44:20 +1000 Subject: Deferred properties are not experimental anymore --- src/declarative/qml/qmlcompiler.cpp | 3 --- 1 file changed, 3 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"); -- cgit v0.12