Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits)
  Fix bug when adding import paths manually
  Update Comment
  Optimize QDeclarativeEngine::importExtension
  QGraphicsEffect : Don't rely on the exposedArea when rendering the item into the cache.
  Fix snapping in listview.
  Minor cleanup.
  Improve flipable example.
  Minor cleanup for visual test framework.
  VisibleArea is not a creatable type.
  More testing.
  Test openUrlExternally
  doc
  example of WebView onAlert, and of popups in general.
  Update examples/declarative.pro
  Update mouseX(Y) when clicking on a mouse area
  Declarative examples cleanup.
  Add test.
  doc
  Move gitignore to right level, update for Linux.
  Cleanup MouseArea visual tests.
  ...

5 files changed, 11 insertions, 11 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 8062e8e..5099e49 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -47,7 +47,7 @@
 #include <QApplication>
 #include <QTranslator>
 #include <QDebug>
-#include "qfxtester.h"
+#include "qdeclarativetester.h"
 #include "qdeclarativefolderlistmodel.h"
 
 QT_USE_NAMESPACE
diff --git a/tools/qml/qfxtester.cpp b/tools/qml/qdeclarativetester.cpp
index 28bbf5e..6245124 100644
--- a/tools/qml/qfxtester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qfxtester.h>
+#include <qdeclarativetester.h>
 #include <QDebug>
 #include <QApplication>
 #include <qdeclarativeview.h>
@@ -311,9 +311,9 @@ void QDeclarativeTester::updateCurrentTime(int msec)
             } else if (frame->msec() == msec) {
                 if (!frame->hash().isEmpty() && frame->hash().toUtf8() != fe.hash.toHex()) {
                     if (options & QDeclarativeViewer::TestImages && !(options & QDeclarativeViewer::Record)) {
-                        qWarning() << "QDeclarativeTester: Mismatched frame hash.  Seen:" 
-                                   << fe.hash.toHex() << "Expected:" 
-                                   << frame->hash().toUtf8();
+                        qWarning() << "QDeclarativeTester: Mismatched frame hash at" << msec
+                                   << ".  Seen:" << fe.hash.toHex()
+                                   << "Expected:" << frame->hash().toUtf8();
                         imagefailure();
                     }
                 }
diff --git a/tools/qml/qfxtester.h b/tools/qml/qdeclarativetester.h
index 6521409..d49c9b8 100644
--- a/tools/qml/qfxtester.h
+++ b/tools/qml/qdeclarativetester.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTESTER_H
-#define QFXTESTER_H
+#ifndef QDECLARATIVETESTER_H
+#define QDECLARATIVETESTER_H
 
 #include <QEvent>
 #include <QMouseEvent>
@@ -283,4 +283,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QFXTESTER_H
+#endif // QDECLARATIVETESTER_H
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index a7eb6f5..ba283b6 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -15,13 +15,13 @@ contains(QT_CONFIG, opengl) {
 # Input
 HEADERS += qmlruntime.h \
            proxysettings.h \
-           qfxtester.h \
+           qdeclarativetester.h \
            deviceorientation.h \
            qdeclarativefolderlistmodel.h
 SOURCES += main.cpp \
            qmlruntime.cpp \
            proxysettings.cpp \
-           qfxtester.cpp \
+           qdeclarativetester.cpp \
            qdeclarativefolderlistmodel.cpp
 RESOURCES = qmlruntime.qrc
 maemo5 {
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 44cab97..1ab528e 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -95,7 +95,7 @@
 #include <QGLWidget>
 #endif
 
-#include <qfxtester.h>
+#include <qdeclarativetester.h>
 
 #if defined (Q_OS_SYMBIAN)
 #define SYMBIAN_NETWORK_INIT