diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
| commit | 4d4cb1023d693a2a4130e032c8894e0f56250f93 (patch) | |
| tree | 24e3db8d63b7149b81c3b509fb5b820caf7ecbff /src/declarative/QmlChanges.txt | |
| parent | 8fe40ca28e88d156b9a0ef9cc4c818a666499231 (diff) | |
| parent | bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff) | |
| download | Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.zip Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.gz Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.bz2 | |
Merge commit 'qt/4.7' into 4.7
Conflicts:
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
Diffstat (limited to 'src/declarative/QmlChanges.txt')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 9ab3f08..ec8f508 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -3,10 +3,9 @@ The changes below are pre Qt 4.7.0 RC Flickable: - overShoot is replaced by boundsBehavior enumeration - - flicking is replaced by flickingHorizontally and flickingVertically - - moving is replaced by movingHorizontally and movingVertically + - flickingHorizontally and flickingVertically properties added + - movingHorizontally and movingVertically properties added - flickDirection is renamed flickableDirection - - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Component: isReady, isLoading, isError and isNull properties removed, use status property instead QList<QObject*> models no longer provide properties in model object. The @@ -19,6 +18,11 @@ C++ API QDeclarativeExpression::value() has been renamed to QDeclarativeExpression::evaluate() +QML Launcher +------------ +The standalone executable has been renamed to qml launcher. Runtime warnings +can be now accessed via the menu (Debugging->Show Warnings). + ============================================================================= The changes below are pre Qt 4.7.0 beta 1 |