From 34ae6deb78c30a80570e0c0dda7b2f071abdbf68 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 8 Aug 2012 13:13:25 +0200 Subject: Remove remnants of QQmlImageProvider QQmlImageProvider was renamed to QQuickImageProvider quite some time ago. Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696 Reviewed-by: Chris Adams --- src/qml/qml.pro | 1 - src/quick/util/qquickimageprovider.cpp | 2 +- sync.profile | 4 ---- 3 files changed, 1 insertion(+), 6 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 diff --git a/sync.profile b/sync.profile index 7ea3be040c..d65c740a66 100644 --- a/sync.profile +++ b/sync.profile @@ -9,10 +9,6 @@ "QtQmlDevTools" => "../qml/qml/parser", ); %deprecatedheaders = ( - "QtQml" => { - "QQmlImageProvider" => "QtQuick/QQuickImageProvider", - "qqmlimageprovider.h" => "QtQuick/qquickimageprovider.h", - }, ); # Module dependencies. # Every module that is required to build this module should have one entry. -- cgit v1.2.3