diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 12:45:42 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 12:45:42 (GMT) |
| commit | df874ce60baf0350b23717853107a9bcc65a5200 (patch) | |
| tree | becb8a7fd1fcb87a386fdb711f4e5aa7beee31b6 /src/declarative | |
| parent | e39e53373754f45cf49eee5232598affec41b21c (diff) | |
| parent | c1bf731ddeb035045cda395e77327d9be4635bb3 (diff) | |
| download | Qt-df874ce60baf0350b23717853107a9bcc65a5200.zip Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.gz Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 8b6b83f..432b5d6 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -50,7 +50,7 @@ Removed Qt.playSound (replaced by SoundEffect element) Removed Qt.closestAngle (use RotationAnimation instead) Removed NumberFormatter Removed DateTimeFormatter (use Qt.formatDateTime() instead) -Using WebView now requires "import org.webkit 1.0" +Using WebView now requires "import QtWebKit 1.0" Using Particles now requires "import Qt.labs.particles 1.0" AnchorAnimation must now be used to animate anchor changes (and not NumberAnimation) Removed ParentAction (use ParentAnimation instead) |