diff options
| author | Lars Knoll <[email protected]> | 2017-08-22 17:17:57 +0200 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2017-08-22 17:17:57 +0200 |
| commit | f1aff1f2d495562460a87d351e62c06109045a3a (patch) | |
| tree | 93e4659421a3dc1fc664b539bf7e48ce28f64e84 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
| parent | 842ada7b04d68cd37df2556bf50b48d8a5f39ec4 (diff) | |
| parent | 46ed14da325c6c0382c0bc54cacc347d2d7f2b0a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Change-Id: Iff06429f948ac6cdec77a9e5bb8c5375c56fe705
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 84b3571069..13cad8c081 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -296,7 +296,7 @@ ReturnedValue QObjectWrapper::getQmlProperty(QQmlContextData *qmlContext, String if (r.isValid()) { if (r.scriptIndex != -1) { return QV4::Encode::undefined(); - } else if (r.type) { + } else if (r.type.isValid()) { return QQmlTypeWrapper::create(v4, d()->object(), r.type, Heap::QQmlTypeWrapper::ExcludeEnums); } else if (r.importNamespace) { |