diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-03-24 05:59:25 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-03-24 05:59:25 (GMT) |
commit | 20fa8670c14c5a34a36c41ce43ef98ae1610fafb (patch) | |
tree | f9b4bd8d8aa35fb2cf537463c8f6db6475ac67a0 /src/declarative/graphicsitems | |
parent | 1e03f391889d90a25847add3a42b1debda4f3edb (diff) | |
parent | d873e2c8a3c17c6404e0378340b25bdb615f12c6 (diff) | |
download | Qt-20fa8670c14c5a34a36c41ce43ef98ae1610fafb.zip Qt-20fa8670c14c5a34a36c41ce43ef98ae1610fafb.tar.gz Qt-20fa8670c14c5a34a36c41ce43ef98ae1610fafb.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflipable.cpp | 2 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeloader.cpp | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8b46039..0e2ae63 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -160,7 +160,7 @@ QDeclarativeFlipable::Side QDeclarativeFlipable::side() const { Q_D(const QDeclarativeFlipable); if (d->dirtySceneTransform) - const_cast<QDeclarativeFlipablePrivate *>(d)->updateSceneTransformFromParent(); + const_cast<QDeclarativeFlipablePrivate *>(d)->ensureSceneTransform(); return d->current; } diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index 3cbafd6..0d62afa 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -41,7 +41,9 @@ #include "qdeclarativeloader_p_p.h" +#include <qdeclarativeinfo.h> #include <qdeclarativeengine_p.h> +#include <qdeclarativeglobal_p.h> QT_BEGIN_NAMESPACE @@ -185,9 +187,6 @@ void QDeclarativeLoader::setSource(const QUrl &url) if (d->source == url) return; - if (!qmlContext(this)->isSafeOrigin(url)) - return; - d->clear(); d->source = url; @@ -299,9 +298,9 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded() return; } if (obj) { - ctxt->setParent(obj); item = qobject_cast<QGraphicsObject *>(obj); if (item) { + QDeclarative_setParent_noEvent(ctxt, obj); if (QDeclarativeItem* qmlItem = qobject_cast<QDeclarativeItem *>(item)) { qmlItem->setParentItem(q); } else { @@ -310,8 +309,14 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded() } // item->setFocus(true); initResize(); + } else { + qmlInfo(q) << QDeclarativeLoader::tr("Loader does not support loading non-visual elements."); + delete obj; + delete ctxt; } } else { + if (!component->errors().isEmpty()) + qWarning() << component->errors(); delete obj; delete ctxt; source = QUrl(); |