projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master <-> api_changes
[profile/ivi/qtdeclarative.git]
/
examples
/
qml
/
cppextensions
/
imageprovider
/
imageprovider.cpp
diff --git
a/examples/qml/cppextensions/imageprovider/imageprovider.cpp
b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
index
7fe4b72
..
f6632a8
100644
(file)
--- a/
examples/qml/cppextensions/imageprovider/imageprovider.cpp
+++ b/
examples/qml/cppextensions/imageprovider/imageprovider.cpp
@@
-39,19
+39,19
@@
****************************************************************************/
****************************************************************************/
-#include <q
declarative
extensionplugin.h>
+#include <q
qml
extensionplugin.h>
-#include <q
declarative
engine.h>
-#include <q
declarative
imageprovider.h>
+#include <q
qml
engine.h>
+#include <q
qml
imageprovider.h>
#include <QImage>
#include <QPainter>
//![0]
#include <QImage>
#include <QPainter>
//![0]
-class ColorImageProvider : public Q
Declarative
ImageProvider
+class ColorImageProvider : public Q
Qml
ImageProvider
{
public:
ColorImageProvider()
{
public:
ColorImageProvider()
- : Q
DeclarativeImageProvider(QDeclarative
ImageProvider::Pixmap)
+ : Q
QmlImageProvider(QQml
ImageProvider::Pixmap)
{
}
{
}
@@
-84,17
+84,17
@@
public:
//![1]
//![1]
-class ImageProviderExtensionPlugin : public Q
Declarative
ExtensionPlugin
+class ImageProviderExtensionPlugin : public Q
Qml
ExtensionPlugin
{
Q_OBJECT
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Q
Declarative
ExtensionInterface" FILE "imageprovider.json")
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Q
Qml
ExtensionInterface" FILE "imageprovider.json")
public:
void registerTypes(const char *uri)
{
Q_UNUSED(uri);
}
public:
void registerTypes(const char *uri)
{
Q_UNUSED(uri);
}
- void initializeEngine(Q
Declarative
Engine *engine, const char *uri)
+ void initializeEngine(Q
Qml
Engine *engine, const char *uri)
{
Q_UNUSED(uri);
engine->addImageProvider("colors", new ColorImageProvider);
{
Q_UNUSED(uri);
engine->addImageProvider("colors", new ColorImageProvider);
@@
-103,7
+103,7
@@
public:
};
};
-#define Q
DeclarativeExtensionInterface_iid "org.qt-project.Qt.QDeclarative
ExtensionInterface"
+#define Q
QmlExtensionInterface_iid "org.qt-project.Qt.QQml
ExtensionInterface"
#include "imageprovider.moc"
#include "imageprovider.moc"