diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:33:25 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:34:29 +0200 |
| commit | 580fa7dc88aae23053e44ffa335a15f6af112a20 (patch) | |
| tree | 5bc915d7c2e252739122d9441bd0d7fa7175d0c2 /src/qmldebug | |
| parent | 6767114285db9d0e16dc278d08f231e8561546b4 (diff) | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0
Diffstat (limited to 'src/qmldebug')
| -rw-r--r-- | src/qmldebug/qqmlenginedebugclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmldebug/qqmlenginedebugclient.cpp b/src/qmldebug/qqmlenginedebugclient.cpp index ec45ec33bc..50f8deb087 100644 --- a/src/qmldebug/qqmlenginedebugclient.cpp +++ b/src/qmldebug/qqmlenginedebugclient.cpp @@ -400,7 +400,7 @@ void QQmlEngineDebugClient::decode(QPacket &ds, QQmlEngineDebugObjectReference obj; obj.name = data.value.toString(); obj.className = prop.valueTypeName; - prop.value = qVariantFromValue(obj); + prop.value = QVariant::fromValue(obj); break; } case QQmlObjectProperty::Unknown: |