qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow setting values in value type group properties in "on" assignments 

Assigning to a group property inside a property value source or
interceptor as part of an "on assignment" is perfectly valid. That is
because while "color" is a value type property, the on assignment means
we're actually setting easing.type (in the example and test) on the
property value source, not the color, and that one is a QObject. The
same goes for interceptors.

 Conflicts:
	src/qml/compiler/qqmlpropertyvalidator.cpp
	src/qml/qml/qqmlvmemetaobject_p.h
	tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp

Change-Id: I505a658977a578894d6dfb00bf5c65b41e42b12f
Task-number: QTBUG-56600
Reviewed-by: Michael Brasser <michael.brasser@live.com>
(cherry picked from commit 2659c30879)
This commit is contained in:
Simon Hausmann 2018-02-21 17:09:50 +01:00
parent 0e7533fce9
commit 10647ce9da
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qml/compiler/qqmltypecompiler.cpp
View File

@ -1914,7 +1914,11 @@ bool QQmlPropertyValidator::validateObject(int objectIndex, const QV4::CompiledD
if (binding->type >= QV4::CompiledData::Binding::Type_Object && (pd || binding->isAttachedProperty())) {
qSwap(_seenObjectWithId, seenSubObjectWithId);
const bool subObjectValid = validateObject(binding->value.objectIndex, binding, pd && QQmlValueTypeFactory::metaObjectForMetaType(pd->propType));
const bool populatingValueTypeGroupProperty
= pd
&& QQmlValueTypeFactory::metaObjectForMetaType(pd->propType)
&& !(binding->flags & QV4::CompiledData::Binding::IsOnAssignment);
const bool subObjectValid = validateObject(binding->value.objectIndex, binding, populatingValueTypeGroupProperty);
qSwap(_seenObjectWithId, seenSubObjectWithId);
if (!subObjectValid)
return false;

11
tests/auto/qml/qqmllanguage/data/groupPropertyInPropertyValueSource.qml Normal file
View File

@ -0,0 +1,11 @@
import QtQuick 2.0
Rectangle {
ColorAnimation on color {
id: animation
from: "red"
to: "darkgray"
duration: 250
easing.type: Easing.InOutQuad
}
}

17
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
View File

@ -43,6 +43,7 @@
#include <QFont>
#include <QQmlFileSelector>
#include <QFileSelector>
#include <QEasingCurve>
#include <private/qqmlproperty_p.h>
#include <private/qqmlmetatype_p.h>
@ -255,6 +256,8 @@ private slots:
void deleteSingletons();
void valueTypeGroupPropertiesInBehavior();
private:
QQmlEngine engine;
QStringList defaultImportPathList;
@ -4154,6 +4157,20 @@ void tst_qqmllanguage::deleteSingletons()
QVERIFY(singleton.data() == 0);
}
void tst_qqmllanguage::valueTypeGroupPropertiesInBehavior()
{
QQmlEngine engine;
QQmlComponent component(&engine, testFileUrl("groupPropertyInPropertyValueSource.qml"));
VERIFY_ERRORS(0);
QScopedPointer<QObject> o(component.create());
QVERIFY(!o.isNull());
QObject *animation = qmlContext(o.data())->contextProperty("animation").value<QObject*>();
QVERIFY(animation);
QCOMPARE(animation->property("easing").value<QEasingCurve>().type(), QEasingCurve::InOutQuad);
}
QTEST_MAIN(tst_qqmllanguage)
#include "tst_qqmllanguage.moc"