diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-04 07:11:59 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-04 07:11:59 (GMT) |
| commit | b065a6838a9c54cb4bba6519695c657db5270ce4 (patch) | |
| tree | b10925754df0608beb5de941b5c1ea4da1f3bd55 /src/declarative/util/qdeclarativetimer.cpp | |
| parent | 813e28ea364e2c1cd568bc3ac38aa5142f025e7d (diff) | |
| parent | 9d0317c91dbbe660af2ed2aa8ea47446049467d2 (diff) | |
| download | Qt-b065a6838a9c54cb4bba6519695c657db5270ce4.zip Qt-b065a6838a9c54cb4bba6519695c657db5270ce4.tar.gz Qt-b065a6838a9c54cb4bba6519695c657db5270ce4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativetimer.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index 56320e6..c240f22 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -82,7 +82,7 @@ public: object to access the current time. \qml - import Qt 4.7 + import QtQuick 1.0 Item { Timer { |