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

3 files changed, 13 insertions, 11 deletions

diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index d506782..24bb61f 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -193,7 +193,9 @@ void QmlConnection::connectIfValid()
             }
         }
         if (sigIdx < 0) {
-            qWarning() << "signal" << d->signal << "not found";
+            // Cannot usefully warn, since could be in middle of
+            // changing sender and signal.
+            // XXX need state change transactions to do better
             return;
         }
 
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.cpp b/tests/auto/declarative/qmlbindengine/testtypes.cpp
index 6122186..3ff05d7 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.cpp
+++ b/tests/auto/declarative/qmlbindengine/testtypes.cpp
@@ -32,10 +32,10 @@ private:
     int m_value;
 };
 
-QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyQmlObject,MyQmlObject);
-QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyDeferredObject,MyDeferredObject);
-QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyQmlContainer,MyQmlContainer);
-QML_DEFINE_EXTENDED_TYPE(Qt/test, 1, 0, 0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
-QML_DEFINE_EXTENDED_TYPE(Qt/test, 1, 0, 0, MyExtendedObject,MyExtendedObject,ExtensionObject);
+QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyQmlObject,MyQmlObject);
+QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyDeferredObject,MyDeferredObject);
+QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyQmlContainer,MyQmlContainer);
+QML_DEFINE_EXTENDED_TYPE(Qt.test, 1, 0, 0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
+QML_DEFINE_EXTENDED_TYPE(Qt.test, 1, 0, 0, MyExtendedObject,MyExtendedObject,ExtensionObject);
 
 #include "testtypes.moc"
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index e35a006..65d061e 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -12,7 +12,7 @@ public:
 };
 
 QML_DECLARE_TYPE(MyQmlObject);
-QML_DEFINE_TYPE(MyQmlObject,MyQmlObject);
+QML_DEFINE_TYPE(Test,1,0,0,MyQmlObject,MyQmlObject);
 
 class MyContainer : public QObject
 {
@@ -31,7 +31,7 @@ private:
 };
 
 QML_DECLARE_TYPE(MyContainer);
-QML_DEFINE_TYPE(MyContainer,MyContainer);
+QML_DEFINE_TYPE(Test,1,0,0,MyContainer,MyContainer);
 
 class tst_QmlMetaProperty : public QObject
 {
@@ -52,7 +52,7 @@ private:
 
 void tst_QmlMetaProperty::writeObjectToList()
 {
-    QmlComponent containerComponent(&engine, "MyContainer { children: MyQmlObject {} }");
+    QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
     MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
     QVERIFY(container != 0);
     QVERIFY(container->children()->size() == 1);
@@ -67,7 +67,7 @@ void tst_QmlMetaProperty::writeObjectToList()
 Q_DECLARE_METATYPE(QList<QObject *>);
 void tst_QmlMetaProperty::writeListToList()
 {
-    QmlComponent containerComponent(&engine, "MyContainer { children: MyQmlObject {} }");
+    QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
     MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
     QVERIFY(container != 0);
     QVERIFY(container->children()->size() == 1);
@@ -87,7 +87,7 @@ void tst_QmlMetaProperty::writeListToList()
 
 void tst_QmlMetaProperty::writeObjectToQmlList()
 {
-    QmlComponent containerComponent(&engine, "MyContainer { qmlChildren: MyQmlObject {} }");
+    QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { qmlChildren: MyQmlObject {} }", QUrl());
     MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
     QVERIFY(container != 0);
     QVERIFY(container->qmlChildren()->size() == 1);