feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Do not assume QmlBuildSystem is current build system

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen
2022-05-03 15:12:40 +03:00
parent c97f0af531
commit ae30e3073c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -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;