diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
| commit | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (patch) | |
| tree | 33246b027739aafd72f9f289876f69627537f2b3 /src/qml/qml/qqmlproperty.cpp | |
| parent | b63bc868875d7571bc332804f984824cff7c5b78 (diff) | |
| parent | 685ad676a84bf48602a5da8f7171792686b94a73 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4mathobject.cpp
Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 21bbcadb1c..9a138dcf80 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -798,7 +798,7 @@ QQmlPropertyPrivate::binding(QObject *object, QQmlPropertyIndex index) const int coreIndex = index.coreIndex(); const int valueTypeIndex = index.valueTypeIndex(); - if (!data->hasBindingBit(coreIndex)) + if (coreIndex < 0 || !data->hasBindingBit(coreIndex)) return 0; QQmlAbstractBinding *binding = data->bindings; @@ -1546,6 +1546,9 @@ bool QQmlProperty::connectNotifySignal(QObject *dest, int method) const represent a regular Qt property or if it has no change notifier signal, or if the \a dest object does not have the specified \a slot. + + \note \a slot should be passed using the SLOT() macro so it is + correctly identified. */ bool QQmlProperty::connectNotifySignal(QObject *dest, const char *slot) const { |