diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:43:26 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:56:14 +0200 |
| commit | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (patch) | |
| tree | 917eff8c50fe4699547b9de852ee53257c1585cf /src/quick/util/qquickimageprovider.cpp | |
| parent | 3e6a8eca00334df344a45f09afbcf8fd8e2b7c54 (diff) | |
| parent | ffdbf216dc80b3d781307bb6b4b7150281c874a3 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
src/quick/util/qquickimageprovider.cpp
Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c
Diffstat (limited to 'src/quick/util/qquickimageprovider.cpp')
| -rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 1d838cac32..b306ab3419 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -53,6 +53,7 @@ public: \class QQuickTextureFactory \since 5.0 \brief The QQuickTextureFactory class provides an interface for loading custom textures from QML. + \inmodule QtQml The purpose of the texture factory is to provide a placeholder for a image data that can be converted into an OpenGL texture. @@ -110,7 +111,8 @@ QImage QQuickTextureFactory::image() const /*! \class QQuickImageProvider - \since 4.7 + \since 5.0 + \inmodule QtQuick \brief The QQuickImageProvider class provides an interface for supporting pixmaps and threaded image requests in QML. QQuickImageProvider is used to provide advanced image loading features @@ -218,6 +220,8 @@ QImage QQuickTextureFactory::image() const \c cache property to \c false for the relevant \l Image, \l BorderImage or \l AnimatedImage object. + The QtQuick 1 version of this class is named QDeclarativeImageProvider. + \sa QQmlEngine::addImageProvider() */ |