diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-24 05:47:31 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-24 05:47:31 (GMT) |
| commit | d873e2c8a3c17c6404e0378340b25bdb615f12c6 (patch) | |
| tree | 0775dae3ceee580bddb5d8e1487825a33eff9a68 /src/declarative/graphicsitems | |
| parent | d19de14f84e9fca8bb709039d5d0331e6ddfe485 (diff) | |
| parent | 7e0711bd85d28204c1405928cfc68a2fd76f3d13 (diff) | |
| download | Qt-d873e2c8a3c17c6404e0378340b25bdb615f12c6.zip Qt-d873e2c8a3c17c6404e0378340b25bdb615f12c6.tar.gz Qt-d873e2c8a3c17c6404e0378340b25bdb615f12c6.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/qdeclarativeloader.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index c06b006..0d62afa 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -187,11 +187,6 @@ void QDeclarativeLoader::setSource(const QUrl &url) if (d->source == url) return; - if (!qmlContext(this)->isSafeOrigin(url)) { - qmlInfo(this) << tr("\"%1\" is not a safe origin from \"%2\"").arg(url.toString()).arg(qmlContext(this)->baseUrl().toString()); - return; - } - d->clear(); d->source = url; |