Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion core/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,17 @@ void Probe::discoverObject(QObject *object)
return;

objectAdded(object);
foreach (QObject *child, object->children()) {

// foreach (QObject *child, object->children()) {
// discoverObject(child);
// }

const auto children = object->children();
for (QObject *child : children) {
if (!child)
continue;
if (m_validObjects.contains(child))
continue;
discoverObject(child);
}
}
Expand Down
17 changes: 14 additions & 3 deletions plugins/quickinspector/quickinspector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -512,16 +512,27 @@ void QuickInspector::objectCreated(QObject *object)
{
if (QQuickWindow *window = qobject_cast<QQuickWindow *>(object)) {
if (QQuickView *view = qobject_cast<QQuickView *>(object)) {
m_probe->discoverObject(view->engine());
if (view->engine()) {
m_probe->discoverObject(view->engine());
}
} else {
QQmlContext *context = QQmlEngine::contextForObject(window);
QQmlEngine *engine = context ? context->engine() : nullptr;

if (!engine) {
engine = qmlEngine(window->contentItem()->childItems().value(0));
// engine = qmlEngine(window->contentItem()->childItems().value(0));
QQuickItem *contentItem = window->contentItem();
if (contentItem) {
const auto children = contentItem->childItems();
if (!children.isEmpty()) {
engine = qmlEngine(children.first());
}
}
}

m_probe->discoverObject(engine);
if (engine) {
m_probe->discoverObject(engine);
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions probe/hooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ extern "C" Q_DECL_EXPORT void gammaray_probe_attach()
if (!qApp) {
return;
}

Hooks::installHooks();
Probe::startupHookReceived();

log_injection("gammaray_probe_attach()\n");
new ProbeCreator(ProbeCreator::Create | ProbeCreator::FindExistingObjects | ProbeCreator::ResendServerAddress);
} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
Expand Down
Loading