aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-05-03 15:12:40 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-05-04 09:11:06 +0000
commitae30e3073c1cf381b0ea04f0369fd62916a57d08 (patch)
treec7311529fc675abd162b7d8ffee38ed9ad03b38b
parentc97f0af531ec41fdc3619fd989bd681c409f029b (diff)
QmlDesigner: Do not assume QmlBuildSystem is current build system
It's possible to open qml files for visual editing from qmake/cmake based projects as well. Fixes: QDS-6836 Change-Id: I15840dbe0f67711b162f7f7f492f7ab813ea7fca Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 8dbe236ca0..11af358679 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -2025,6 +2025,8 @@ void NodeInstanceView::updateQsbPathToFilterMap()
m_qsbPathToFilterMap.clear();
if (m_currentTarget && !m_qsbPath.isEmpty()) {
const auto bs = qobject_cast<QmlProjectManager::QmlBuildSystem *>(m_currentTarget->buildSystem());
+ if (!bs)
+ return;
const QStringList shaderToolFiles = bs->shaderToolFiles();
#ifndef QMLDESIGNER_TEST
@@ -2056,6 +2058,9 @@ void NodeInstanceView::handleShaderChanges()
return;
const auto bs = qobject_cast<QmlProjectManager::QmlBuildSystem *>(m_currentTarget->buildSystem());
+ if (!bs)
+ return;
+
QStringList baseArgs = bs->shaderToolArgs();
if (baseArgs.isEmpty())
return;