10 files changed, 43 insertions, 46 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index e65808f..fa9f05b 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -3,18 +3,18 @@
 \target qmlexamples
 \title QML Examples
 
-A viewer application is included that allows you to quickly explore many of the
+A \l {qmlviewer}{viewer} application is included that allows you to quickly explore many of the
 examples.  It has some useful options, revealed by:
 
 \code
-    bin/duiviewer -help
+    bin/qmlviewer -help
 \endcode
 
-There are several illustrative XML examples available.  From your build 
+There are several illustrative QML examples available.  From your build 
 directory, 
 
 \code
-    bin/duiviewer $QT_SOURCE_DIR/examples/declarative/mediabrowser/mediabrowser.qml
+    bin/qmlviewer $QT_SOURCE_DIR/demos/declarative/phonebrowser/phonebrowser.qml
 \endcode
 
 Many other simple examples can be found under the \c examples/declarative sub 
@@ -32,5 +32,4 @@ own QML-based applications.
 software rasterizer, a simple canvas backend is used by default. To use 
 Graphics View instead, set \c QML_USE_GRAPHICSVIEW=1.
 
-
 */
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index e0d4ca3..fc747a9 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -48,7 +48,7 @@ element whose text is determined by whether or not it has \e {active focus}.
 An \l Item requests focus by setting the \c {Item::focus} property to true.  
 
 For very simple cases simply setting the \c {Item::focus} property is sometimes
-sufficient.  If we run the following example in the \c duiviewer, we see that
+sufficient.  If we run the following example in the \c qmlviewer, we see that
 the \c {<KeyActions/>} element has \e {active focus} and pressing the
 \e A, \e B, or \e C keys modifies the text appropriately.
 
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index caadbf5..aa94c06 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -43,10 +43,10 @@ The \c anchors.horizontalCenter property refers to the horizontal center of an e
 
 \section2 Viewing the example
 
-To view what you have created, run the duiviewer (located in the \c bin directory) with your filename as the first argument. For example, to run the provided completed Tutorial 1 example from the install location, you would type:
+To view what you have created, run the qmlviewer (located in the \c bin directory) with your filename as the first argument. For example, to run the provided completed Tutorial 1 example from the install location, you would type:
 
 \code
-bin/duiviewer examples/tutorials/t1/tutorial1.qml
+bin/qmlviewer examples/tutorials/t1/tutorial1.qml
 \endcode
 
 [\l tutorial] [Next: \l tutorial2]
diff --git a/doc/src/duiviewer.qdoc b/doc/src/qmlviewer.qdoc
index f967f87..e8fdec4 100644
--- a/doc/src/duiviewer.qdoc
+++ b/doc/src/qmlviewer.qdoc
@@ -40,23 +40,22 @@
 ****************************************************************************/
 
 /*!
-    \page duiviewer.html
-    \title Declarative UI Viewer (duiviewer)
+    \page qmlviewer.html
+    \title Qt Declarative UI Viewer (qmlviewer)
     \ingroup qttools
-    \keyword duiviewer
+    \keyword qmlviewer
 
     This page documents the \e{Declarative UI Viewer} for the Qt GUI
-    toolkit. The \c duiviewer reads an XML format declarative user interface definition
-    (\c .qml) file
-    and displays the user interface it describes.
+    toolkit. The \c qmlviewer reads a declarative user interface definition
+    (\c .qml) file and displays the user interface it describes.
 
     \section1 Options
 
-    When run with the \c -help option, duiviewer shows available options.
+    When run with the \c -help option, qmlviewer shows available options.
 
     \section1 Dummy Data
 
-    One use of duiviewer is to allow QML files to be viewed stand-alone,
+    One use of qmlviewer is to allow QML files to be viewed stand-alone,
     rather than being loaded from within a Qt program. Qt applications will
     usually bind objects and properties into the execution context before
     running the QML. To stand-in for such bindings, you can provide dummy
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 3724b10..16dad6e 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -77,7 +77,7 @@
     sub directory the files are numbered in an order of increasing features.
 
     The code in this example is not compiled, but interpreted at run time.
-    This means you should use the duiviewer application provided with
+    This means you should use the qmlviewer application provided with
     Qt to run the examples.
 
     \list
diff --git a/tools/duiviewer/main.cpp b/tools/qmlviewer/main.cpp
index cb4ba05..c5676ab 100644
--- a/tools/duiviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -12,7 +12,7 @@
 ****************************************************************************/
 
 #include "qml.h"
-#include "qfxviewer.h"
+#include "qmlviewer.h"
 #include <QWidget>
 #include <QDir>
 #include "qfxtestengine.h"
@@ -21,7 +21,7 @@
 
 void usage()
 {
-    qWarning("Usage: duiviewer [options] <filename>");
+    qWarning("Usage: qmlviewer [options] <filename>");
     qWarning(" ");
     qWarning(" options:");
     qWarning("  -v, -version ............................. display version");
@@ -116,9 +116,9 @@ int main(int argc, char ** argv)
     if (fileName.isEmpty())
         usage();
 
-    QFxViewer viewer(testMode, testDir, 0, frameless ? Qt::FramelessWindowHint : Qt::Widget);
+    QmlViewer viewer(testMode, testDir, 0, frameless ? Qt::FramelessWindowHint : Qt::Widget);
     viewer.setCacheEnabled(cache);
-    viewer.openXml(fileName);
+    viewer.openQml(fileName);
     if (period>0)
         viewer.setRecordPeriod(period);
     if (autorecord_to)
diff --git a/tools/duiviewer/qfxviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index b15a8bf..87bebfa 100644
--- a/tools/duiviewer/qfxviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -14,7 +14,7 @@
 #include <qfxview.h>
 
 #include "qmlbindablevalue.h"
-#include "qfxviewer.h"
+#include "qmlviewer.h"
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
 #include "qml.h"
@@ -34,7 +34,7 @@
 #include <QProcess>
 #include <QMenu>
 
-QFxViewer::QFxViewer(QFxTestEngine::TestMode testMode, const QString &testDir, QWidget *parent, Qt::WindowFlags flags)
+QmlViewer::QmlViewer(QFxTestEngine::TestMode testMode, const QString &testDir, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags)
 {
     testEngine = 0;
@@ -58,12 +58,12 @@ QFxViewer::QFxViewer(QFxTestEngine::TestMode testMode, const QString &testDir, Q
     resize(width, height);
 }
 
-void QFxViewer::reload()
+void QmlViewer::reload()
 {
-    openXml(currentFileName);
+    openQml(currentFileName);
 }
 
-void QFxViewer::openXml(const QString& fileName)
+void QmlViewer::openQml(const QString& fileName)
 {
     setWindowTitle(tr("%1 - Qt Declarative UI Viewer").arg(fileName));
 
@@ -180,7 +180,7 @@ void PreviewDeviceSkin::populateContextMenu(QMenu *menu)
 }
 
 
-void QFxViewer::setSkin(const QString& skinDirectory)
+void QmlViewer::setSkin(const QString& skinDirectory)
 {
     DeviceSkinParameters parameters;
     QString err;
@@ -199,7 +199,7 @@ void QFxViewer::setSkin(const QString& skinDirectory)
     }
 }
 
-void QFxViewer::setAutoRecord(int from, int to)
+void QmlViewer::setAutoRecord(int from, int to)
 {
     record_autotime = to-from;
     if (from) {
@@ -210,12 +210,12 @@ void QFxViewer::setAutoRecord(int from, int to)
     }
 }
 
-void QFxViewer::setRecordPeriod(int ms)
+void QmlViewer::setRecordPeriod(int ms)
 {
     record_period = ms;
 }
 
-void QFxViewer::sceneResized(QSize size)
+void QmlViewer::sceneResized(QSize size)
 {
     if (size.width() > 0 && size.height() > 0) {
         canvas->setFixedSize(size.width(), size.height());
@@ -226,13 +226,13 @@ void QFxViewer::sceneResized(QSize size)
     }
 }
 
-void QFxViewer::resizeEvent(QResizeEvent *)
+void QmlViewer::resizeEvent(QResizeEvent *)
 {
     if (!skin)
         canvas->setFixedSize(width(),height());
 }
 
-void QFxViewer::keyPressEvent(QKeyEvent *event)
+void QmlViewer::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_0 && devicemode)
         exit(0);
@@ -250,7 +250,6 @@ void QFxViewer::keyPressEvent(QKeyEvent *event)
     } else if (event->key() == Qt::Key_F2 || (event->key() == Qt::Key_2 && devicemode)) {
         setRecording(!recordTimer.isActive());
     } else if (event->key() == Qt::Key_F3 || (event->key() == Qt::Key_3 && devicemode)) {
-        setRecording(!recordTimer.isActive());
         canvas->asImage().save("snapshot.png");
         qDebug() << "Wrote snapshot.png";
     } else if (event->key() == Qt::Key_F4 || (event->key() == Qt::Key_4 && devicemode)) {
@@ -274,7 +273,7 @@ void QFxViewer::keyPressEvent(QKeyEvent *event)
     QWidget::keyPressEvent(event);
 }
 
-void QFxViewer::setRecording(bool on)
+void QmlViewer::setRecording(bool on)
 {
     if (on == recordTimer.isActive())
         return;
@@ -328,7 +327,7 @@ void QFxViewer::setRecording(bool on)
     qDebug() << "Recording: " << (recordTimer.isActive()?"ON":"OFF");
 }
 
-void QFxViewer::timerEvent(QTimerEvent *event)
+void QmlViewer::timerEvent(QTimerEvent *event)
 {
     if (event->timerId() == recordTimer.timerId()) {
         frames.append(new QImage(canvas->asImage()));
@@ -343,12 +342,12 @@ void QFxViewer::timerEvent(QTimerEvent *event)
     }
 }
 
-void QFxViewer::setDeviceKeys(bool on)
+void QmlViewer::setDeviceKeys(bool on)
 {
     devicemode = on;
 }
 
-void QFxViewer::setCacheEnabled(bool on)
+void QmlViewer::setCacheEnabled(bool on)
 {
     QNetworkAccessManager * nam = canvas->engine()->networkAccessManager();
     if (on == !!nam->cache())
@@ -364,4 +363,4 @@ void QFxViewer::setCacheEnabled(bool on)
     }
 }
 
-#include "qfxviewer.moc"
+#include "qmlviewer.moc"
diff --git a/tools/duiviewer/qfxviewer.h b/tools/qmlviewer/qmlviewer.h
index 7a190c5..0fa879d 100644
--- a/tools/duiviewer/qfxviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -11,8 +11,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXVIEWER_H
-#define QFXVIEWER_H
+#ifndef QMLVIEWER_H
+#define QMLVIEWER_H
 
 #include <QWidget>
 #include <QBasicTimer>
@@ -25,11 +25,11 @@ class QFxView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
 
-class QFxViewer : public QWidget
+class QmlViewer : public QWidget
 {
 Q_OBJECT
 public:
-    QFxViewer(QFxTestEngine::TestMode = QFxTestEngine::NoTest, const QString &testDir = QString(), QWidget *parent=0, Qt::WindowFlags flags=0);
+    QmlViewer(QFxTestEngine::TestMode = QFxTestEngine::NoTest, const QString &testDir = QString(), QWidget *parent=0, Qt::WindowFlags flags=0);
 
     void setRecordDither(const QString& s) { record_dither = s; }
     void setRecordPeriod(int ms);
@@ -43,7 +43,7 @@ public:
 
 public slots:
     void sceneResized(QSize size);
-    void openXml(const QString& fileName);
+    void openQml(const QString& fileName);
     void reload();
 
 protected:
diff --git a/tools/duiviewer/duiviewer.pro b/tools/qmlviewer/qmlviewer.pro
index eae313e..08d2d2b 100644
--- a/tools/duiviewer/duiviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -1,8 +1,8 @@
 DESTDIR = ../../bin
 QT += declarative script network sql
 # Input
-HEADERS += qfxviewer.h 
-SOURCES += main.cpp qfxviewer.cpp 
+HEADERS += qmlviewer.h
+SOURCES += main.cpp qmlviewer.cpp
 
 include($$QT_SOURCE_TREE/tools/shared/deviceskin/deviceskin.pri)
 
diff --git a/tools/tools.pro b/tools/tools.pro
index 12da18c..2c83580 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -24,7 +24,7 @@ mac {
 
 SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += duiviewer qmlconv
+contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmlconv
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
 embedded: SUBDIRS += makeqpf