diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-03-01 07:57:03 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-03-01 07:57:03 (GMT) |
| commit | e538957c77f71b1cc38a3c43c9f3157f65a3ff11 (patch) | |
| tree | 3d013b12ba28668d127fe5532de5fc588fe63cb0 /tools/qml/qdeclarativetester.cpp | |
| parent | 67d5513b5aca096dfc33952cf81219087b0e41b0 (diff) | |
| parent | 2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff) | |
| download | Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.zip Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.gz Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'tools/qml/qdeclarativetester.cpp')
| -rw-r--r-- | tools/qml/qdeclarativetester.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp index 3f4be57..11f81fc 100644 --- a/tools/qml/qdeclarativetester.cpp +++ b/tools/qml/qdeclarativetester.cpp @@ -48,7 +48,10 @@ #include <QDir> #include <QCryptographicHash> #include <private/qabstractanimation_p.h> +#include <QGraphicsObject> +#ifndef Q_OS_SYMBIAN #include <private/qdeclarativeitem_p.h> +#endif QT_BEGIN_NAMESPACE @@ -266,7 +269,9 @@ void QDeclarativeTester::save() void QDeclarativeTester::updateCurrentTime(int msec) { +#ifndef Q_OS_SYMBIAN QDeclarativeItemPrivate::setConsistentTime(msec); +#endif if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot) return; |