summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepropertychanges.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-27 16:42:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-27 16:42:14 (GMT)
commita17339e943f21bb6c6e16884f716dd9ab8f94938 (patch)
treef75b19e3a5f9d436c00c6b269488414513d943c5 /src/declarative/util/qdeclarativepropertychanges.cpp
parentc78fb096c31df3b7d3cd9018f26518f59f4fde65 (diff)
parentba97ea29d33acf9ab421f4d8ef5202ec83231d7e (diff)
downloadQt-a17339e943f21bb6c6e16884f716dd9ab8f94938.zip
Qt-a17339e943f21bb6c6e16884f716dd9ab8f94938.tar.gz
Qt-a17339e943f21bb6c6e16884f716dd9ab8f94938.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (30 commits) Ensure text document is created before we access it. Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin ...
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
-rw-r--r--src/declarative/util/qdeclarativepropertychanges.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index ab50bb1..4b2d5a0 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -125,8 +125,9 @@ QT_BEGIN_NAMESPACE
}
\endqml
- Changes to an Item's parent or anchors should be done using the associated change elements
- (ParentChange and AnchorChanges, respectively) rather than PropertyChanges.
+ Anchor margins should be changed with PropertyChanges, but other anchor changes or changes to
+ an Item's parent should be done using the associated change elements
+ (ParentChange and AnchorChanges, respectively).
\sa {qmlstate}{States}, QtDeclarative
*/