diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 14:15:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 14:15:20 (GMT) |
| commit | e97cacf23bc3910fd3368563afa97fed0e2597a5 (patch) | |
| tree | b13c7997beebf68579e6c477c5a0a7edbc2f0c5b /src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| parent | 2b6120af53973f46195b884db97642d622f61694 (diff) | |
| download | Qt-e97cacf23bc3910fd3368563afa97fed0e2597a5.zip Qt-e97cacf23bc3910fd3368563afa97fed0e2597a5.tar.gz Qt-e97cacf23bc3910fd3368563afa97fed0e2597a5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Don't hang if started with ',block' argument
QDeclarativeDebug: Fix QJSDebugService if launched with ',block'
Fix docs on caching for images loaded by image providers
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QDeclarative: fixed clean animation lists
DeclarativeObserver: Don't fade in the highlight edge
Renamed declarativeobserver plugin to qmldbg_inspector
QmlDebugger: adding slots to items in Live Preview
QmlDebugger: parsing packets iteratively in the communication protocol
qmlplugindump: Bump QtQuick.tooling version to 1.1.
qmlplugindump: Dump revision property.
qmlplugindump: Fix --path usage with drive letters on Windows.
ListView segmentation fault when setting highlight to null
DeclarativeObserver: Fixed duplicates in item selection
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index b7fcbb5..8787a5e 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -87,6 +87,32 @@ QT_BEGIN_NAMESPACE */ /*! + \qmlproperty url AnimatedImage::source + + This property holds the URL that refers to the source image. + + AnimatedImage can handle any image format supported by Qt, loaded from any + URL scheme supported by Qt. + + \sa QDeclarativeImageProvider +*/ + +/*! + \qmlproperty bool AnimatedImage::asynchronous + + Specifies that images on the local filesystem should be loaded + asynchronously in a separate thread. The default value is + false, causing the user interface thread to block while the + image is loaded. Setting \a asynchronous to true is useful where + maintaining a responsive user interface is more desirable + than having images immediately visible. + + Note that this property is only valid for images read from the + local filesystem. Images loaded via a network resource (e.g. HTTP) + are always loaded asynchonously. +*/ + +/*! \qmlproperty bool AnimatedImage::cache \since Quick 1.1 |