diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-08-08 13:13:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-09 11:50:58 +0200 |
| commit | 34ae6deb78c30a80570e0c0dda7b2f071abdbf68 (patch) | |
| tree | b67ed381bd87ffde42951a4d4dea95a0b4216d03 /src | |
| parent | d25f11bb15cad8b24e4d0aaa041e998d0f86d3f7 (diff) | |
Remove remnants of QQmlImageProvider
QQmlImageProvider was renamed to QQuickImageProvider quite some time
ago.
Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml.pro | 1 | ||||
| -rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 5c165027fc..4cb112ca6f 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -14,7 +14,6 @@ exists("qqml_enable_gcov") { LIBS += -lgcov } -MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider load(qt_module_config) QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 08ed8c12fa..798af57939 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -121,7 +121,7 @@ QImage QQuickTextureFactory::image() const \list \li Loaded using QPixmaps rather than actual image files - \li Loaded asynchronously in a separate thread, if imageType() is \l{QQmlImageProvider::ImageType}{ImageType::Image} + \li Loaded asynchronously in a separate thread, if imageType() is \l{QQuickImageProvider::ImageType}{ImageType::Image} \endlist To specify that an image should be loaded by an image provider, use the |