From ce7b865cf7a90f6187bcb9419fbc616f869baeb5 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 6 Jan 2023 08:37:03 +0100 Subject: [PATCH] QmlPreview: Robustify preview runner a bit Don't rely on qobject_cast not returning null for eternity. Change-Id: I0adede2f05a27e4f98ee47e737af38732f1e4c31 Reviewed-by: Christian Stenger --- src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index 0f45914bbe6..03b6d3d2e80 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -115,14 +115,15 @@ public: CommandLine cmd = commandLine(); if (const auto aspect = runControl->aspect()) { - const auto currentTarget = runControl->target(); - const auto qmlBuildSystem = qobject_cast(currentTarget->buildSystem()); + const auto qmlBuildSystem = qobject_cast( + runControl->target()->buildSystem()); + QTC_ASSERT(qmlBuildSystem, return); const QString mainScript = aspect->mainScript; const QString currentFile = aspect->currentFile; const QString mainScriptFromProject = qmlBuildSystem->targetFile( - FilePath::fromString(mainScript)).toString(); + FilePath::fromString(mainScript)).path(); QStringList qmlProjectRunConfigurationArguments = cmd.splitArguments();