Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

6 files changed, 11 insertions, 11 deletions

diff --git a/tools/qmldebugger/engine.cpp b/tools/qmldebugger/engine.cpp
index 1f4bcc2..6e163e6 100644
--- a/tools/qmldebugger/engine.cpp
+++ b/tools/qmldebugger/engine.cpp
@@ -43,7 +43,7 @@ EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent)
     enginesFile.open(QFile::ReadOnly);
     Q_ASSERT(enginesFile.isOpen());
 
-    m_engineView = new QFxView(this);
+    m_engineView = new QmlView(this);
     m_engineView->rootContext()->setContextProperty("engines", qVariantFromValue(&m_engineItems));
     m_engineView->setContentResizable(true);
     m_engineView->setQml(enginesFile.readAll());
diff --git a/tools/qmldebugger/engine.h b/tools/qmldebugger/engine.h
index 52f0608..5ef28ae 100644
--- a/tools/qmldebugger/engine.h
+++ b/tools/qmldebugger/engine.h
@@ -4,7 +4,7 @@
 #include <QWidget>
 #include <QtDeclarative/qmlengine.h>
 #include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qfxview.h>
+#include <QtDeclarative/qmlview.h>
 #include <QtDeclarative/qmldebug.h>
 
 QT_BEGIN_NAMESPACE
@@ -51,7 +51,7 @@ private:
     QTreeWidget *m_objTree;
     QTableWidget *m_propTable;
 
-    QFxView *m_engineView;
+    QmlView *m_engineView;
     QList<QObject *> m_engineItems;
 };
 
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp
index 3732aaf..d4802f6 100644
--- a/tools/qmlviewer/qfxtester.cpp
+++ b/tools/qmlviewer/qfxtester.cpp
@@ -14,7 +14,7 @@
 #include <qfxtester.h>
 #include <QDebug>
 #include <QApplication>
-#include <QFxView>
+#include <qmlview.h>
 #include <QFile>
 #include <QmlComponent>
 #include <QCryptographicHash>
@@ -29,7 +29,7 @@ QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, Mouse, QFxVisualT
 QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, Key, QFxVisualTestKey);
 
 QFxTester::QFxTester(const QString &script, QmlViewer::ScriptOptions opts, 
-                     QFxView *parent)
+                     QmlView *parent)
 : QAbstractAnimation(parent), m_view(parent), filterEvents(true), options(opts), 
   testscript(0), hasFailed(false)
 {
diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h
index e37d6aa..4ace2d1 100644
--- a/tools/qmlviewer/qfxtester.h
+++ b/tools/qmlviewer/qfxtester.h
@@ -155,7 +155,7 @@ QML_DECLARE_TYPE(QFxVisualTestKey)
 class QFxTester : public QAbstractAnimation
 {
 public:
-    QFxTester(const QString &script, QmlViewer::ScriptOptions options, QFxView *parent);
+    QFxTester(const QString &script, QmlViewer::ScriptOptions options, QmlView *parent);
 
     virtual int duration() const;
 
@@ -174,7 +174,7 @@ private:
     enum Destination { View, ViewPort };
     void addKeyEvent(Destination, QKeyEvent *);
     void addMouseEvent(Destination, QMouseEvent *);
-    QFxView *m_view;
+    QmlView *m_view;
 
     struct MouseEvent {
         MouseEvent(QMouseEvent *e)
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 2894f1d..2ac13cc 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -11,7 +11,7 @@
 **
 ****************************************************************************/
 
-#include <qfxview.h>
+#include <qmlview.h>
 #include "ui_recopts.h"
 
 #include "qmlviewer.h"
@@ -286,7 +286,7 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     if (!(flags & Qt::FramelessWindowHint))
         createMenu(menuBar(),0);
 
-    canvas = new QFxView(this);
+    canvas = new QmlView(this);
     canvas->setAttribute(Qt::WA_OpaquePaintEvent);
     canvas->setAttribute(Qt::WA_NoSystemBackground);
     canvas->setContentResizable(!skin || !scaleSkin);
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index f0e997c..c785e89 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QFxView;
+class QmlView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
 class QProcess;
@@ -95,7 +95,7 @@ private:
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
-    QFxView *canvas;
+    QmlView *canvas;
     QmlTimer recordTimer;
     QString frame_fmt;
     QImage frame;