diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-31 01:01:32 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-31 09:44:09 +0100 |
commit | 9c050d452961f348c8bcc33e3422aed6316bb18b (patch) | |
tree | b8af41758d885bfad84ccbd52e24eb1544908fda /src/qml/qml/qqmlproperty.cpp | |
parent | 59760e6ce0da6780fcbdf0b2dc123f989baaa3eb (diff) | |
parent | bcbc3c9cec1f7d7bb8c9d5f5ea94eb5c81ec2853 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
src/qml/common/qv4compileddata_p.h
src/qml/types/qqmlbind.cpp
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index b6baa86bd7..f5aae8f462 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -63,6 +63,7 @@ #include <private/qqmlvaluetypewrapper_p.h> #include <QtCore/qdebug.h> #include <cmath> +#include <QtQml/QQmlPropertyMap> Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QList<qreal>) @@ -331,10 +332,15 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name) return; } else { - if (!property->isQObject()) - return; // Not an object property + if (!property->isQObject()) { + if (auto asPropertyMap = qobject_cast<QQmlPropertyMap*>(currentObject)) + currentObject = asPropertyMap->value(path.at(ii).toString()).value<QObject*>(); + else + return; // Not an object property, and not a property map + } else { + property->readProperty(currentObject, ¤tObject); + } - property->readProperty(currentObject, ¤tObject); if (!currentObject) return; // No value } |