diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 16:35:19 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 22:32:42 +0200 |
commit | 7d3a56f3cf717a06823c33b031ea4f590e14002d (patch) | |
tree | b5d2845e8353ba2de3028a9f32749ca622e115da /examples | |
parent | f92c3aecd08eef468f9a47f2e970f22beecc8216 (diff) | |
parent | e5f45d9b57bb0542ec47e5a8a4e57388b6d59d35 (diff) |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/cppextensions/imageprovider/imageprovider.cpp | 6 | ||||
-rw-r--r-- | examples/qml/cppextensions/imageprovider/imageprovider.pro | 2 |
2 files changed, 4 insertions, 4 deletions
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 <qqmlextensionplugin.h> #include <qqmlengine.h> -#include <qqmlimageprovider.h> +#include <qquickimageprovider.h> #include <QImage> #include <QPainter> //![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 |