diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-04-24 17:20:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 10:17:53 +0200 |
| commit | ef240bfdf1db0d65d6945a83d8c722d44841e206 (patch) | |
| tree | 95558dd6d8389690a9ed4a2d8b9c49b0dafacc1c /src | |
| parent | c1bce4000d0f2ae5ef1c26f4b38cb1f61fee690c (diff) | |
Fix QQml name change build failures.
Change-Id: If0063be8c61fe5c38a55455db27cd6046aa326db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/bluetooth/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp | 2 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp index c529ea3c..397068c4 100644 --- a/src/imports/bluetooth/plugin.cpp +++ b/src/imports/bluetooth/plugin.cpp @@ -65,7 +65,7 @@ public: qmlRegisterType<QDeclarativeBluetoothSocket>(uri, major, minor, "BluetoothSocket"); } - void initializeEngine(QDeclarativeEngine *engine, const char *uri) { + void initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(uri); engine->addImageProvider("bluetoothicons", new BluetoothThumbnailImageProvider); } diff --git a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp index f06f4229..c53a3185 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp @@ -85,7 +85,7 @@ QImage BluetoothThumbnailImageProvider::requestImage(const QString &id, QSize *s } BluetoothThumbnailImageProvider::BluetoothThumbnailImageProvider() - :QDeclarativeImageProvider(QDeclarativeImageProvider::Image) + :QQuickImageProvider(QQuickImageProvider::Image) { } diff --git a/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h b/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h index 2e61e637..8dfec8db 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QQmlImageProvider> +#include <QtQuick/QQuickImageProvider> #include <QMap> #include <qbluetoothserviceinfo.h> @@ -47,7 +47,7 @@ QTBLUETOOTH_USE_NAMESPACE -class BluetoothThumbnailImageProvider : public QQmlImageProvider +class BluetoothThumbnailImageProvider : public QQuickImageProvider { public: // This is run in a low priority thread. |