aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlobjectcreator.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-02-26 11:54:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-02 14:49:16 +0100
commit75989858270298fcd7153cb39af3c4a64c359833 (patch)
treea3d2630027aa2b6bca8539ec97918570e3746202 /src/qml/qml/qqmlobjectcreator.cpp
parent850a50bb115e6fa6ca3cc32cb2f110a0b70e7a36 (diff)
[new compiler] Remove incorrect assertion
It is perfectly valid for example to do Behaviour on someColor.r Change-Id: I39961509b4698c19441f71baa4af197f633c5b39 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
-rw-r--r--src/qml/qml/qqmlobjectcreator.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index ac70cb2c16..07a570e0fa 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -675,7 +675,6 @@ bool QQmlObjectCreator::setPropertyBinding(QQmlPropertyData *property, const QV4
QObject *createdSubObject = 0;
if (binding->type == QV4::CompiledData::Binding::Type_Object) {
- Q_ASSERT(!_valueTypeProperty);
createdSubObject = createInstance(binding->value.objectIndex, _bindingTarget);
if (!createdSubObject)
return false;