diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-02 06:05:00 (GMT) |
| commit | 34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd (patch) | |
| tree | a7e0c9a55afb413443c55733622e813e17eaea95 /src/declarative/QmlChanges.txt | |
| parent | 685c0b930a1d1ecfdcc78aa688a333564cc9ca5b (diff) | |
| parent | fd7d730d04862095898773a781bb9a254d0aeb00 (diff) | |
| download | Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.zip Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.gz Qt-34b8c17600c3a2a398f61baaa2ca8f8ff3075cbd.tar.bz2 | |
Merge branch 'master' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
Diffstat (limited to 'src/declarative/QmlChanges.txt')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 34e4834..c312abf 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -12,6 +12,7 @@ Connection: syntax and rename: Connection { sender: a; signal: bar(); script: yyy } becomes: Connections { target: a; onFoo: xxx; onBar: yyy } +Using WebView now requires "import org.webkit 1.0" QmlView ------- |