From b143d3fb589e7ce7171c9975679fa47181a6a10f Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 15 Mar 2012 13:40:43 +0100 Subject: Fix the build & docs after QQmlImageProvider was renamed The class was renamed to QQuickImageProvider in commit 3bc907d155034fe64efc8cb6056b48f0c6401bfb. Change-Id: I91ff38244cee3ab651ed6caa4140a58cb742f1c9 Reviewed-by: Martin Jones --- doc/src/qml/qtbinding.qdoc | 2 +- examples/qml/cppextensions/imageprovider/imageprovider.cpp | 6 +++--- examples/qml/cppextensions/imageprovider/imageprovider.pro | 2 +- modules/qt_declarative.pri | 2 +- modules/qt_qml.pri | 2 +- src/quick/items/qquickanimatedimage.cpp | 2 +- src/quick/items/qquickborderimage.cpp | 2 +- src/quick/items/qquickimage.cpp | 4 ++-- sync.profile | 8 ++++++-- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/doc/src/qml/qtbinding.qdoc b/doc/src/qml/qtbinding.qdoc index b480d1292f..d8dd66bded 100644 --- a/doc/src/qml/qtbinding.qdoc +++ b/doc/src/qml/qtbinding.qdoc @@ -43,7 +43,7 @@ You may want to mix QML and C++ for a number of reasons. For example: \li To use functionality defined in a C++ source (for example, when using a C++ Qt-based data model, or calling functions in a third-party C++ library) \li To access functionality in the Qt Declarative module (for example, to dynamically generate -images using QQmlImageProvider) +images using QQuickImageProvider) \li To write your own QML elements (whether for your applications, or for distribution to others) \endlist diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/cppextensions/imageprovider/imageprovider.cpp index f6632a89e8..d60057e83a 100644 --- a/examples/qml/cppextensions/imageprovider/imageprovider.cpp +++ b/examples/qml/cppextensions/imageprovider/imageprovider.cpp @@ -42,16 +42,16 @@ #include #include -#include +#include #include #include //![0] -class ColorImageProvider : public QQmlImageProvider +class ColorImageProvider : public QQuickImageProvider { public: ColorImageProvider() - : QQmlImageProvider(QQmlImageProvider::Pixmap) + : QQuickImageProvider(QQuickImageProvider::Pixmap) { } diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.pro b/examples/qml/cppextensions/imageprovider/imageprovider.pro index b4a832b720..e85bad9866 100644 --- a/examples/qml/cppextensions/imageprovider/imageprovider.pro +++ b/examples/qml/cppextensions/imageprovider/imageprovider.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += qml +QT += qml quick DESTDIR = ImageProviderCore TARGET = qmlimageproviderplugin diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index 619f562f49..d6827ab8ab 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -85,7 +85,7 @@ QT.declarative.DEFINES = \ QDeclarativeFontLoader=QQuickFontLoader\ QDeclarativeFontValueType=QQmlFontValueType\ QDeclarativeGuard=QQmlGuard\ - QDeclarativeImageProvider=QQmlImageProvider\ + QDeclarativeImageProvider=QQuickImageProvider\ QDeclarativeImports=QQmlImports\ QDeclarativeIncubationController=QQmlIncubationController\ QDeclarativeIncubator=QQmlIncubator\ diff --git a/modules/qt_qml.pri b/modules/qt_qml.pri index 82e70e3e93..3a6318e37f 100644 --- a/modules/qt_qml.pri +++ b/modules/qt_qml.pri @@ -12,6 +12,6 @@ QT.qml.libs = $$QT_MODULE_LIB_BASE QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE QT.qml.imports = $$QT_MODULE_IMPORT_BASE QT.qml.depends = gui network xmlpatterns -QT.qml.DEFINES = QT_QML_LIB +QT.qml.DEFINES = QT_QML_LIB QQmlImageProvider=QQuickImageProvider QT_CONFIG += qml diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index 6567892fb4..9319cf1252 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE AnimatedImage can handle any image format supported by Qt, loaded from any URL scheme supported by Qt. - \sa QQmlImageProvider + \sa QQuickImageProvider */ /*! diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 71514593a3..b99a2f4cae 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -257,7 +257,7 @@ QQuickBorderImage::~QQuickBorderImage() The URL may be absolute, or relative to the URL of the component. - \sa QQmlImageProvider + \sa QQuickImageProvider */ /*! diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 2346689178..64c8ba1e55 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -147,7 +147,7 @@ QQuickImagePrivate::QQuickImagePrivate() size bounded via the \l sourceSize property. This is especially important for content that is loaded from external sources or provided by the user. - \sa {declarative/imageelements/image}{Image example}, QQmlImageProvider + \sa {declarative/imageelements/image}{Image example}, QQuickImageProvider */ QQuickImage::QQuickImage(QQuickItem *parent) @@ -431,7 +431,7 @@ qreal QQuickImage::paintedHeight() const The URL may be absolute, or relative to the URL of the component. - \sa QQmlImageProvider + \sa QQuickImageProvider */ /*! diff --git a/sync.profile b/sync.profile index 7c7e1a5507..e03ca08883 100644 --- a/sync.profile +++ b/sync.profile @@ -48,8 +48,8 @@ "qdeclarativeextensioninterface.h" => "QtQml/qqmlextensioninterface.h", "QDeclarativeExtensionPlugin" => "QtQml/QQmlExtensionPlugin", "qdeclarativeextensionplugin.h" => "QtQml/qqmlextensionplugin.h", - "QDeclarativeImageProvider" => "QtQml/QQmlImageProvider", - "qdeclarativeimageprovider.h" => "QtQml/qqmlimageprovider.h", + "QDeclarativeImageProvider" => "QtQuick/QQuickImageProvider", + "qdeclarativeimageprovider.h" => "QtQuick/qquickimageprovider.h", "QDeclarativeIncubationController" => "QtQml/QQmlIncubationController", "QDeclarativeIncubator" => "QtQml/QQmlIncubator", "qdeclarativeincubator.h" => "QtQml/qqmlincubator.h", @@ -208,6 +208,10 @@ "qv8worker_p.h" => "QtQml/private/qv8worker_p.h", "textwriter_p.h" => "QtQml/private/textwriter_p.h", }, + "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