--- a/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Mon May 03 13:18:40 2010 +0300
@@ -43,18 +43,18 @@
 
 #include <QApplication>
 #include <QObject>
-#include <QmlView>
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QUrl>
-#include <qml.h>
+#include <QDeclarativeView>
+#include <qdeclarative.h>
+#include <QtDeclarative>
 
 QTM_USE_NAMESPACE
 
 //! [0]
 QML_DECLARE_TYPE(QValueSpaceSubscriber);
-QML_DEFINE_TYPE(Qt, 4, 6, ValueSpaceSubscriber, QValueSpaceSubscriber);
 //! [0]
 
 class MainWidget : public QWidget
@@ -65,7 +65,7 @@
     MainWidget();
 
 private:
-    QmlView *view;
+    QDeclarativeView *view;
 };
 
 MainWidget::MainWidget()
@@ -74,12 +74,14 @@
     vbox->setMargin(0);
     setLayout(vbox);
 
-    view = new QmlView(this);
+    view = new QDeclarativeView(this);
     view->setFixedSize(100, 230);
     vbox->addWidget(view);
 
-    view->setUrl(QUrl("qrc:/battery-meter.qml"));
-    view->execute();
+    //! [2]
+    view->setSource(QUrl("qrc:/battery-meter.qml"));
+    view->show();
+    //! [2]
 
     QPushButton *quitButton = new QPushButton("Quit");
     vbox->addWidget(quitButton);
@@ -88,6 +90,10 @@
 
 int main(int argc, char *argv[])
 {
+    //! [1]
+    qmlRegisterType<QValueSpaceSubscriber>("Qt", 4, 6, "ValueSpaceSubscriber");
+    //! [1]
+
     QApplication app(argc, argv);
 
     MainWidget mainWidget;