diff options
| -rw-r--r-- | src/qml/qml.pro | 1 | ||||
| -rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 | ||||
| -rw-r--r-- | sync.profile | 4 |
3 files changed, 1 insertions, 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. |