summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-04-29 06:19:34 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-04-29 06:19:34 (GMT)
commit6f2498fefc2c30ab5dc77e4e21af0556a48fc935 (patch)
tree7bac1014be378c890383b7acbd18febce3a66779 /src/declarative
parent11b7b2d5728df05060288909510c184180b0ff35 (diff)
parent42945f30e9b3cb70c43d51575aac204e3371fe33 (diff)
downloadQt-6f2498fefc2c30ab5dc77e4e21af0556a48fc935.zip
Qt-6f2498fefc2c30ab5dc77e4e21af0556a48fc935.tar.gz
Qt-6f2498fefc2c30ab5dc77e4e21af0556a48fc935.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/QmlChanges.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 9c46467..7218f78 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -2,6 +2,8 @@
The changes below are pre Qt 4.7.0 RC
Flickable: overShoot is replaced by boundsBehavior enumeration.
+Component: isReady, isLoading, isError and isNull properties removed, use
+ status property instead
C++ API
-------