diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-12 02:53:33 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-12 02:53:33 (GMT) |
| commit | 41ebe4457a62949ba93f20d5ff9c90d3ee7ea499 (patch) | |
| tree | dddc0f983edce65998d74feb5c1b31c52d5f0222 /src | |
| parent | 32f92350d8f253582cf2385d5c0731b1a277e84c (diff) | |
| parent | b5d5e1df4d03e45dbcff5fa1e289cd7dbd5b3e5b (diff) | |
| download | Qt-41ebe4457a62949ba93f20d5ff9c90d3ee7ea499.zip Qt-41ebe4457a62949ba93f20d5ff9c90d3ee7ea499.tar.gz Qt-41ebe4457a62949ba93f20d5ff9c90d3ee7ea499.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index ffdb02f..a60a9de 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -18,6 +18,7 @@ Connection: syntax and rename: becomes: Connections { target: a; onFoo: xxx; onBar: yyy } Using WebView now requires "import org.webkit 1.0" +Using Particles now requires "import Qt.labs.particles 1.0" AnchorAnimation must now be used to animate anchor changes (and not NumberAnimation) QmlView @@ -50,10 +51,10 @@ C++ API QML_DEFINE_... definition macros, previously global macros, are replaced by QML_REGISTER_... registration macros, which must be called explicitly. C++ API users should also consider using the QmlExtensionPlugin (previously named QmlModulePlugin) -as a cleaner mechanism for publishing libraries of QML types, or the upcoming +as a cleaner mechanism for publishing libraries of QML types, or the upcoming application plugin features of the qmlviewer / qmlruntime / qml. -QDeclarativeContext::addDefaultObject() has been replaced with +QDeclarativeContext::addDefaultObject() has been replaced with QDeclarativeContext::setContextObject() PropertyAnimation |