Port to Qt5

diff --git a/qml/AbstractDialog.qml b/qml/AbstractDialog.qml
index 55937a3..0f9adf2 100644 (file)
--- a/qml/AbstractDialog.qml
+++ b/qml/AbstractDialog.qml
@@ -9,7 +9,7 @@
  *
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item {
     id: root

diff --git a/qml/CallItemView.qml b/qml/CallItemView.qml
index 3117016..b12b8b2 100644 (file)
--- a/qml/CallItemView.qml
+++ b/qml/CallItemView.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item
 {

diff --git a/qml/CallItemViewLarge.qml b/qml/CallItemViewLarge.qml
index 4d56b97..c7edaea 100644 (file)
--- a/qml/CallItemViewLarge.qml
+++ b/qml/CallItemViewLarge.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 import 'javascripts/framework.js' as Support
 

diff --git a/qml/DeviceDelegate.qml b/qml/DeviceDelegate.qml
index a4cc51c..d85bffc 100644 (file)
--- a/qml/DeviceDelegate.qml
+++ b/qml/DeviceDelegate.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 Item {
     id: root
     property string deviceName

diff --git a/qml/DeviceDelegateActive.qml b/qml/DeviceDelegateActive.qml
index 663b9ce..3bb3c09 100644 (file)
--- a/qml/DeviceDelegateActive.qml
+++ b/qml/DeviceDelegateActive.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 Item {
     id: root
     property string deviceName

diff --git a/qml/DialNumPad.qml b/qml/DialNumPad.qml
index a4d8b68..2d74142 100644 (file)
--- a/qml/DialNumPad.qml
+++ b/qml/DialNumPad.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item
 {

diff --git a/qml/DialNumPadButton.qml b/qml/DialNumPadButton.qml
index 0593768..de07c33 100644 (file)
--- a/qml/DialNumPadButton.qml
+++ b/qml/DialNumPadButton.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item
 {

diff --git a/qml/DialNumberEntry.qml b/qml/DialNumberEntry.qml
index 926f96e..4de95a0 100644 (file)
--- a/qml/DialNumberEntry.qml
+++ b/qml/DialNumberEntry.qml
@@ -9,7 +9,7 @@
  *
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Image
 {

diff --git a/qml/DialPage.qml b/qml/DialPage.qml
index db0ce51..09f2788 100644 (file)
--- a/qml/DialPage.qml
+++ b/qml/DialPage.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 import Tizen.Bluetooth 0.0 
 

diff --git a/qml/MessageDialog.qml b/qml/MessageDialog.qml
index f707ec2..781308f 100644 (file)
--- a/qml/MessageDialog.qml
+++ b/qml/MessageDialog.qml
@@ -9,7 +9,7 @@
  *
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 AbstractDialog {
     id: root

diff --git a/qml/RequestConfirmDialog.qml b/qml/RequestConfirmDialog.qml
index ef9e74a..22a4533 100644 (file)
--- a/qml/RequestConfirmDialog.qml
+++ b/qml/RequestConfirmDialog.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     id: root

diff --git a/qml/RequestPidCodeDialog.qml b/qml/RequestPidCodeDialog.qml
index 8ff76e0..cddd125 100644 (file)
--- a/qml/RequestPidCodeDialog.qml
+++ b/qml/RequestPidCodeDialog.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     id: root

diff --git a/qml/RequestpasskeyDialog.qml b/qml/RequestpasskeyDialog.qml
index 828abeb..27c878b 100644 (file)
--- a/qml/RequestpasskeyDialog.qml
+++ b/qml/RequestpasskeyDialog.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     id: root

diff --git a/qml/main.qml b/qml/main.qml
index ca3eb94..3f27f36 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import Qt 4.7
+import QtQuick 2.0
 import com.hfdialer 1.0
 
 import 'javascripts/framework.js' as Support

diff --git a/src/main.cpp b/src/main.cpp
index dfe2f0b..97dffe5 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,6 @@
 
 #include <QtGui>
 #include <QApplication>
-#include <QDeclarativeView>
 #include <QFile>
 
 int main(int argc, char *argv[])

diff --git a/src/qmlmainwindow.cpp b/src/qmlmainwindow.cpp
index fbdf401..72d3963 100644 (file)
--- a/src/qmlmainwindow.cpp
+++ b/src/qmlmainwindow.cpp
@@ -8,16 +8,19 @@
  *
  */
 
+#include <QQuickView>
+#include <QQuickItem>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QWidget>
+
 #include "common.h"
 #include "dialerapplication.h"
-
 #include "qmlcallitem.h"
 #include "qmldialer.h"
-
 #include "qmlmainwindow.h"
 
-#include <QtDeclarative>
-
 #define CONFIG_KEY_QML_LOAD_URL "/apps/dialer/qml/url"
 
 #define DEFAULT_QML_LOAD_URL "file:///usr/share/hfdialer/qml/main.qml"
@@ -33,11 +36,11 @@ public:
     { TRACE; }
 
     QMLDialer               *adapter;
-    QDeclarativeEngine      *engine;
-    QDeclarativeView        *qdv; 
+    QQmlEngine      *engine;
+    QQuickView        *qdv; 
     
-    QDeclarativeComponent   *component;
-    QDeclarativeItem        *item;
+    QQmlComponent   *component;
+    QQuickItem        *item;
 };
 
 static void registerDataTypes()
@@ -48,15 +51,15 @@ static void registerDataTypes()
     qmlRegisterUncreatableType<QMLCallItem>("com.hfdialer", 1, 0, "CallItem", "");
 }
 
-QMLMainWindow::QMLMainWindow(QWidget *parent)
-    : QDeclarativeView(parent),
+QMLMainWindow::QMLMainWindow(QQuickView *parent)
+    : QQuickView(parent),
       d(new QMLMainWindowPrivate)
 {
     TRACE;
     DialerApplication *da = DialerApplication::instance();
     CallManager *cm = ManagerProxy::instance()->callManager();
 
-    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    setResizeMode(QQuickView::SizeRootObjectToView);
 
     this->setWindowTitle(qtTrId("xx_window"));
 
@@ -86,7 +89,7 @@ QMLMainWindow* QMLMainWindow::instance()
 }
 
 
-QMLMainWindow* QMLMainWindow::instanceP(QWidget* parent)
+QMLMainWindow* QMLMainWindow::instanceP(QQuickView* parent)
 {
     TRACE;
     static QMLMainWindow *_instance = NULL;
@@ -105,11 +108,11 @@ void QMLMainWindow::setupUi()
     TRACE;
     MGConfItem qmlUrl(CONFIG_KEY_QML_LOAD_URL);
 
-    d->engine = new QDeclarativeEngine(this);
+    d->engine = new QQmlEngine(this);
 
     d->engine->rootContext()->setContextProperty("controller", this); //TODO: Remove
     this->setSource(QUrl::fromLocalFile("/usr/share/hfdialer/qml/main.qml"));
-    d->component = new QDeclarativeComponent(d->engine, this);
+    d->component = new QQmlComponent(d->engine, this);
     d->component->loadUrl(qmlUrl.value(DEFAULT_QML_LOAD_URL).toString());
 
     if(d->component->isError())
@@ -118,7 +121,7 @@ void QMLMainWindow::setupUi()
             return;
         }
 
-    d->item = qobject_cast<QDeclarativeItem*>(d->component->create());
+    d->item = qobject_cast<QQuickItem*>(d->component->create());
     if(!d->item)
         {
             qCritical() << "Failed to create item from component!";
@@ -133,7 +136,7 @@ void QMLMainWindow::tryToShow()
     if (d->component->isReady())
         {
             DialerApplication *da = DialerApplication::instance();
-           da->setActiveWindow(this);
+           da->activeWindow();
             da->activeWindow()->show();
             da->activeWindow()->activateWindow();
             this->show();

diff --git a/src/qmlmainwindow.h b/src/qmlmainwindow.h
index 62a07b8..c0bf95a 100644 (file)
--- a/src/qmlmainwindow.h
+++ b/src/qmlmainwindow.h
@@ -11,20 +11,20 @@
 #ifndef QMLMAINWINDOW_H
 #define QMLMAINWINDOW_H
 
-#include <QDeclarativeView>
-#include <QDeclarativeComponent>
+#include <QQuickView>
+#include <QQmlComponent>
 #include "qmldialer.h"
 #include "callitem.h"
 
 class QMLMainWindowPrivate;
 
-class QMLMainWindow : public QDeclarativeView 
+class QMLMainWindow : public QQuickView 
 {
     Q_OBJECT;
 
 public:
     static   QMLMainWindow* instance();
-    static   QMLMainWindow* instanceP(QWidget* parent);
+    static   QMLMainWindow* instanceP(QQuickView* parent);
     ~QMLMainWindow();
 
 Q_SIGNALS:
@@ -41,9 +41,9 @@ protected Q_SLOTS:
     void onGeometryChanged();
 
 private:
-    explicit QMLMainWindow(QWidget *parent = 0);
+    explicit QMLMainWindow(QQuickView *parent = 0);
     QMLMainWindowPrivate *d;
-    QDeclarativeView qv;
+    QQuickView qv;
     Q_DISABLE_COPY(QMLMainWindow)
 };
 

diff --git a/src/src.pro b/src/src.pro
index 23d6e89..f34dbcf 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,6 +1,6 @@
 TARGET = dialer
 TEMPLATE = app
-QT += dbus declarative
+QT += dbus quick qml widgets
 CONFIG += qdbus mobility qt-mobility link_pkgconfig network
 PKGCONFIG += libpulse-mainloop-glib
 MOBILITY += contacts multimedia