summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-15 01:17:34 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-15 01:17:34 (GMT)
commitb55f19b956958dc94e8f35e7dc215a70445759a4 (patch)
tree5b1f7e020b5d501369c944933613d467e1df8473 /src/declarative/graphicsitems
parentacec7123d383840d66fa63e84d0d0a0b72820496 (diff)
parent6a536a8750bf0c82d9bfd557c09827bf61e9986a (diff)
downloadQt-b55f19b956958dc94e8f35e7dc215a70445759a4.zip
Qt-b55f19b956958dc94e8f35e7dc215a70445759a4.tar.gz
Qt-b55f19b956958dc94e8f35e7dc215a70445759a4.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.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 61a32e5..6dbcd16 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -155,6 +155,8 @@ void QDeclarativeLoaderPrivate::initResize()
QDeclarativeLoader::QDeclarativeLoader(QDeclarativeItem *parent)
: QDeclarativeItem(*(new QDeclarativeLoaderPrivate), parent)
{
+ Q_D(QDeclarativeItem);
+ d->flags |= QGraphicsItem::ItemIsFocusScope;
}
/*!
@@ -348,7 +350,7 @@ QDeclarativeLoader::Status QDeclarativeLoader::status() const
/*!
\qmlproperty real Loader::progress
-This property holds the progress of loading QML data from the network, from
+This property holds the progress of loading QML data from the network, from
0.0 (nothing loaded) to 1.0 (finished). Most QML files are quite small, so
this value will rapidly change from 0 to 1.