diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-31 04:14:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-31 04:14:19 (GMT) |
| commit | 8c757e4b84748c19e5f66da432d8af2e7db40cde (patch) | |
| tree | ad24456d6ed47d8b3114fde2903e344e21bd884a | |
| parent | ff711bebd7a8857bc78b9a2854591489fcb15497 (diff) | |
| download | Qt-8c757e4b84748c19e5f66da432d8af2e7db40cde.zip Qt-8c757e4b84748c19e5f66da432d8af2e7db40cde.tar.gz Qt-8c757e4b84748c19e5f66da432d8af2e7db40cde.tar.bz2 | |
Minor cleanup for visual test framework.
| -rw-r--r-- | tools/qml/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qml/qdeclarativetester.cpp (renamed from tools/qml/qfxtester.cpp) | 8 | ||||
| -rw-r--r-- | tools/qml/qdeclarativetester.h (renamed from tools/qml/qfxtester.h) | 6 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 4 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
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 |