qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remnants of QQmlImageProvider 

QQmlImageProvider was renamed to QQuickImageProvider quite some time
ago.

Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
This commit is contained in:
Kent Hansen 2012-08-08 13:13:25 +02:00 committed by Qt by Nokia
parent d25f11bb15
commit 34ae6deb78
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/qml.pro
View File

@ -14,7 +14,6 @@ exists("qqml_enable_gcov") {
LIBS += -lgcov LIBS += -lgcov
} }
MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider
load(qt_module_config) load(qt_module_config)
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf

2
src/quick/util/qquickimageprovider.cpp
View File

@ -121,7 +121,7 @@ QImage QQuickTextureFactory::image() const
\list \list
\li Loaded using QPixmaps rather than actual image files \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 \endlist
To specify that an image should be loaded by an image provider, use the To specify that an image should be loaded by an image provider, use the

4
sync.profile
View File

@ -9,10 +9,6 @@
"QtQmlDevTools" => "../qml/qml/parser", "QtQmlDevTools" => "../qml/qml/parser",
); );
%deprecatedheaders = ( %deprecatedheaders = (
"QtQml" => {
"QQmlImageProvider" => "QtQuick/QQuickImageProvider",
"qqmlimageprovider.h" => "QtQuick/qquickimageprovider.h",
},
); );
# Module dependencies. # Module dependencies.
# Every module that is required to build this module should have one entry. # Every module that is required to build this module should have one entry.