summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-24 04:07:26 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-24 04:07:26 (GMT)
commit562ff1d1fcb726932aa4483655aa0d4c6a9746f2 (patch)
tree458e725c4431493bf8433df435b483f97a115bec /src/declarative/graphicsitems
parentd33d30719d3c17fc1505e1b508999c76c6abc6b4 (diff)
downloadQt-562ff1d1fcb726932aa4483655aa0d4c6a9746f2.zip
Qt-562ff1d1fcb726932aa4483655aa0d4c6a9746f2.tar.gz
Qt-562ff1d1fcb726932aa4483655aa0d4c6a9746f2.tar.bz2
Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader.cpp5
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;