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

4 files changed, 11 insertions, 7 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index 86239cf..bb1020c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -263,6 +263,7 @@ void QmlGraphicsLoaderPrivate::_q_sourceLoaded()
 
         QObject *obj = component->create(ctxt);
         if (obj) {
+            ctxt->setParent(obj);
             item = qobject_cast<QmlGraphicsItem *>(obj);
             if (item) {
                 item->setParentItem(q);
@@ -271,6 +272,7 @@ void QmlGraphicsLoaderPrivate::_q_sourceLoaded()
             }
         } else {
             delete obj;
+            delete ctxt;
             source = QUrl();
         }
         emit q->sourceChanged();
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 8258bcb..f45b7b8 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -147,7 +147,7 @@ QmlScriptEngine::QmlScriptEngine(QmlEnginePrivate *priv)
         newQMetaObject(StaticQtMetaObject::get());
     globalObject().setProperty(QLatin1String("Qt"), qtObject);
 
-    offlineStoragePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+    offlineStoragePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation).replace(QLatin1Char('/'), QDir::separator())
         + QDir::separator() + QLatin1String("QML")
         + QDir::separator() + QLatin1String("OfflineStorage");
     qt_add_qmlxmlhttprequest(this);
@@ -233,6 +233,8 @@ QmlEnginePrivate::~QmlEnginePrivate()
     typeNameClass = 0;
     delete listClass;
     listClass = 0;
+    delete globalClass;
+    globalClass = 0;
 
     for(int ii = 0; ii < bindValues.count(); ++ii)
         clear(bindValues[ii]);
@@ -309,7 +311,7 @@ QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine()
 
     \code
     QmlEngine engine;
-    QmlComponent component(&engine, "Text { text: \"Hello world!\" }");
+    QmlComponent component(&engine, "import Qt 4.6\nText { text: \"Hello world!\" }", QUrl());
     QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(component.create());
 
     //add item to view, etc
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index a1ea90d..9c7aff8 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -806,7 +806,7 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
         if (value.userType() == QVariant::Double) { 
             double integral;
             double fractional = modf(value.toDouble(), &integral);
-            if (qFuzzyCompare(fractional, (double)0.0))
+            if (qFuzzyIsNull(fractional))
                 v.convert(QVariant::Int);
         }
         return writeEnumProperty(prop, coreIdx, object, v, flags);
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 8afe667..a4f67ac 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -2064,8 +2064,8 @@ void QmlPropertyAnimation::prepare(QmlMetaProperty &p)
         d->property = d->userProperty;
 
     if (!d->rangeIsSet) {
-        d->va->setStartValue(QVariant(0.0f));
-        d->va->setEndValue(QVariant(1.0f));
+        d->va->setStartValue(qreal(0));
+        d->va->setEndValue(qreal(1));
         d->rangeIsSet = true;
     }
 
@@ -2227,8 +2227,8 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions,
 
     if (data->actions.count()) {
         if (!d->rangeIsSet) {
-            d->va->setStartValue(QVariant(0.0f));
-            d->va->setEndValue(QVariant(1.0f));
+            d->va->setStartValue(qreal(0));
+            d->va->setEndValue(qreal(1));
             d->rangeIsSet = true;
         }
         d->va->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped);