diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-08 07:37:06 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-08 07:37:06 (GMT) |
| commit | 28605b56271cd3efb78c5f2f51855d2bca56ee6f (patch) | |
| tree | 3bc0988400d8d8f4dd251c94d20443ecd3f6b150 /examples/declarative/scrollbar/ScrollBar.qml | |
| parent | 3ceffd7287a269ec5ea9dab712ee9120a539e0e1 (diff) | |
| parent | be8a7153d613586d69ac528153a6b8ccbe931aa6 (diff) | |
| download | Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.zip Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.tar.gz Qt-28605b56271cd3efb78c5f2f51855d2bca56ee6f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/tutorials/samegame/samegame4/content/samegame.js
Diffstat (limited to 'examples/declarative/scrollbar/ScrollBar.qml')
| -rw-r--r-- | examples/declarative/scrollbar/ScrollBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml index 802b537..d2f52d5 100644 --- a/examples/declarative/scrollbar/ScrollBar.qml +++ b/examples/declarative/scrollbar/ScrollBar.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 Item { id: scrollBar |