diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
commit | 15dc45ce109fe41699950a9b87282901b21f2d3d (patch) | |
tree | 809e79e7b55988006bb3d990168b2bb7eda360b5 /src/qml | |
parent | cf53bf9ae6716613c120cc4a0202c69bd59eba1e (diff) | |
parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 4 | ||||
-rw-r--r-- | src/qml/util/qqmlpropertymap.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index b335d6f402..5c123a678b 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1137,9 +1137,9 @@ static void QQmlComponent_setQmlParent(QObject *me, QObject *parent) As of QtQuick 1.1, this method accepts an optional \a properties argument that specifies a map of initial property values for the created object. These values are applied before object - creation is finalized. (This is more efficient than setting property values after object creation, + creation is finalized. This is more efficient than setting property values after object creation, particularly where large sets of property values are defined, and also allows property bindings - to be set up before the object is created.) + to be set up (using \l{Qt::binding}{Qt.binding}) before the object is created. The \a properties argument is specified as a map of property-value items. For example, the code below creates an object with initial \c x and \c y values of 100 and 200, respectively: diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index c327fd8ce4..f963e9074a 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -81,8 +81,8 @@ protected: virtual QVariant updateValue(const QString &key, const QVariant &input); template<class DerivedType> - QQmlPropertyMap(DerivedType *derived, QObject *parent) - : QObject(*allocatePrivate(), parent) + QQmlPropertyMap(DerivedType *derived, QObject *parentObj) + : QObject(*allocatePrivate(), parentObj) { Q_UNUSED(derived) init(&DerivedType::staticMetaObject); |