Port to Qt5

diff --git a/declarative/components.cpp b/declarative/components.cpp
index 57df6d4..0d74aea 100644 (file)
--- a/declarative/components.cpp
+++ b/declarative/components.cpp
@@ -19,10 +19,8 @@ void Components::registerTypes(const char *uri)
     qmlRegisterType<BluetoothDevicesModel>(uri,0,0,"BluetoothDevicesModel");
 }
 
-void Components::initializeEngine(QDeclarativeEngine *engine, const char *uri)
+void Components::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(uri);
     Q_UNUSED(engine);
 }
-
-Q_EXPORT_PLUGIN(Components);

diff --git a/declarative/components.h b/declarative/components.h
index 5e3813b..edf6434 100644 (file)
--- a/declarative/components.h
+++ b/declarative/components.h
@@ -9,16 +9,17 @@
 #ifndef COMPONENTS_H
 #define COMPONENTS_H
 
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <Qt/QtQml>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
 
-class Components : public QDeclarativeExtensionPlugin
+class Components : public QQmlExtensionPlugin
 {
     Q_OBJECT
 
 public:
     void registerTypes(const char *uri);
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
 #endif // COMPONENTS_H

diff --git a/declarative/declarative.pro b/declarative/declarative.pro
index c9c2a63..d2dc887 100644 (file)
--- a/declarative/declarative.pro
+++ b/declarative/declarative.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-QT += declarative dbus
+QT += qml dbus
 
 CONFIG += qt \
     plugin \