diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-26 22:59:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-26 22:59:51 (GMT) |
| commit | a9462494b6eb5e07f8320cf7d99bdad9c9917434 (patch) | |
| tree | 09ebfbdc94e04278414608ef09125b0ac8fc6646 /src/declarative/util/qdeclarativeview.cpp | |
| parent | a5391f187b91aaf9d6932f2ad1e81701e6cd0352 (diff) | |
| parent | 124efaa694316a4e02684fde151395d8e1d28b7a (diff) | |
| download | Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.zip Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.tar.gz Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativeview.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index e68ef94..b7ce9c9 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -116,7 +116,7 @@ public: void frameBreak() { ++breaks; } private: - QTime timer; + QElapsedTimer timer; int breaks; }; @@ -152,7 +152,7 @@ public: QBasicTimer resizetimer; QDeclarativeView::ResizeMode resizeMode; - QTime frameTimer; + QElapsedTimer frameTimer; void init(); |