diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /src/qml/debugger | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/debugger.pri | 5 | ||||
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 1 | ||||
| -rw-r--r-- | src/qml/debugger/qqmlenginedebugservice.cpp | 12 | ||||
| -rw-r--r-- | src/qml/debugger/qqmlinspectorservice.cpp | 1 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 2545c7836d..77a3ba6490 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -34,8 +34,3 @@ HEADERS += \ $$PWD/qqmlprofiler_p.h INCLUDEPATH += $$PWD - -!contains(DEFINES, QT_QML_NO_DEBUGGER): static { - DEFINES += QML_DEBUGGER_EMBED - include(../../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri) -} diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index 9715b5c8d4..b4f905eb7c 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -460,6 +460,7 @@ QQmlDebugServer::QQmlDebugServer() } } #else + Q_UNUSED(&cleanup) if (!appD->qmljsDebugArgumentsString().isEmpty()) { qWarning() << QString(QLatin1String( "QML Debugger: Ignoring \"-qmljsdebugger=%1\". " diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index cb533a0459..088f3203d6 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -96,8 +96,16 @@ QDataStream &operator>>(QDataStream &ds, QDataStream &operator<<(QDataStream &ds, const QQmlEngineDebugService::QQmlObjectProperty &data) { - ds << (int)data.type << data.name << data.value << data.valueTypeName - << data.binding << data.hasNotifySignal; + ds << (int)data.type << data.name; + // check first whether the data can be saved + // (otherwise we assert in QVariant::operator<<) + QByteArray buffer; + QDataStream fakeStream(&buffer, QIODevice::WriteOnly); + if (QMetaType::save(fakeStream, data.value.type(), data.value.constData())) + ds << data.value; + else + ds << QVariant(); + ds << data.valueTypeName << data.binding << data.hasNotifySignal; return ds; } diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index 31fa9bddef..89c2c17c45 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -106,6 +106,7 @@ void QQmlInspectorService::updateState() return; } + m_currentInspectorPlugin = 0; foreach (QQmlInspectorInterface *inspector, m_inspectorPlugins) { if (inspector->canHandleView(m_views.first())) { m_currentInspectorPlugin = inspector; |